+
()
@Output() firstStepError = new EventEmitter()
@ViewChild('videofileInput') videofileInput: ElementRef
- // So that it can be accessed in the template
- readonly SPECIAL_SCHEDULED_PRIVACY = VideoEdit.SPECIAL_SCHEDULED_PRIVACY
-
userVideoQuotaUsed = 0
userVideoQuotaUsedDaily = 0
isUploadingAudioFile = false
isUploadingVideo = false
- isUpdatingVideo = false
videoUploaded = false
- videoUploadObservable: Subscription = null
videoUploadPercents = 0
videoUploadedIds = {
id: 0,
@@ -49,7 +45,13 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
error: string
enableRetryAfterError: boolean
+ // So that it can be accessed in the template
protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PUBLIC
+ protected readonly BASE_VIDEO_UPLOAD_URL = VideoService.BASE_VIDEO_URL + 'upload-resumable'
+
+ private uploadxOptions: UploadxOptions
+ private isUpdatingVideo = false
+ private fileToUpload: File
constructor (
protected formValidatorService: FormValidatorService,
@@ -61,15 +63,77 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
protected videoCaptionService: VideoCaptionService,
private userService: UserService,
private router: Router,
- private hooks: HooksService
- ) {
+ private hooks: HooksService,
+ private resumableUploadService: UploadxService
+ ) {
super()
+
+ this.uploadxOptions = {
+ endpoint: this.BASE_VIDEO_UPLOAD_URL,
+ multiple: false,
+ token: this.authService.getAccessToken(),
+ uploaderClass: UploaderXFormData,
+ retryConfig: {
+ maxAttempts: 6,
+ shouldRetry: (code: number) => {
+ return code < 400 || code >= 501
+ }
+ }
+ }
}
get videoExtensions () {
return this.serverConfig.video.file.extensions.join(', ')
}
+ onUploadVideoOngoing (state: UploadState) {
+ switch (state.status) {
+ case 'error':
+ const error = state.response?.error || 'Unknow error'
+
+ this.handleUploadError({
+ error: new Error(error),
+ name: 'HttpErrorResponse',
+ message: error,
+ ok: false,
+ headers: new HttpHeaders(state.responseHeaders),
+ status: +state.responseStatus,
+ statusText: error,
+ type: HttpEventType.Response,
+ url: state.url
+ })
+ break
+
+ case 'cancelled':
+ this.isUploadingVideo = false
+ this.videoUploadPercents = 0
+
+ this.firstStepError.emit()
+ this.enableRetryAfterError = false
+ this.error = ''
+ break
+
+ case 'queue':
+ this.closeFirstStep(state.name)
+ break
+
+ case 'uploading':
+ this.videoUploadPercents = state.progress
+ break
+
+ case 'paused':
+ this.notifier.info($localize`Upload on hold`)
+ break
+
+ case 'complete':
+ this.videoUploaded = true
+ this.videoUploadPercents = 100
+
+ this.videoUploadedIds = state?.response.video
+ break
+ }
+ }
+
ngOnInit () {
super.ngOnInit()
@@ -78,6 +142,9 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
this.userVideoQuotaUsed = data.videoQuotaUsed
this.userVideoQuotaUsedDaily = data.videoQuotaUsedDaily
})
+
+ this.resumableUploadService.events
+ .subscribe(state => this.onUploadVideoOngoing(state))
}
ngAfterViewInit () {
@@ -85,7 +152,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
}
ngOnDestroy () {
- if (this.videoUploadObservable) this.videoUploadObservable.unsubscribe()
+ this.cancelUpload()
}
canDeactivate () {
@@ -105,137 +172,43 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
}
}
- getVideoFile () {
- return this.videofileInput.nativeElement.files[0]
- }
-
- setVideoFile (files: FileList) {
+ onFileDropped (files: FileList) {
this.videofileInput.nativeElement.files = files
- this.fileChange()
+
+ this.onFileChange({ target: this.videofileInput.nativeElement })
}
- getAudioUploadLabel () {
- const videofile = this.getVideoFile()
- if (!videofile) return $localize`Upload`
+ onFileChange (event: Event | { target: HTMLInputElement }) {
+ const file = (event.target as HTMLInputElement).files[0]
- return $localize`Upload ${videofile.name}`
+ if (!file) return
+
+ if (!this.checkGlobalUserQuota(file)) return
+ if (!this.checkDailyUserQuota(file)) return
+
+ if (this.isAudioFile(file.name)) {
+ this.isUploadingAudioFile = true
+ return
+ }
+
+ this.isUploadingVideo = true
+ this.fileToUpload = file
+
+ this.uploadFile(file)
}
- fileChange () {
- this.uploadFirstStep()
+ uploadAudio () {
+ this.uploadFile(this.getInputVideoFile(), this.previewfileUpload)
}
retryUpload () {
this.enableRetryAfterError = false
this.error = ''
- this.uploadVideo()
+ this.uploadFile(this.fileToUpload)
}
cancelUpload () {
- if (this.videoUploadObservable !== null) {
- this.videoUploadObservable.unsubscribe()
- }
-
- this.isUploadingVideo = false
- this.videoUploadPercents = 0
- this.videoUploadObservable = null
-
- this.firstStepError.emit()
- this.enableRetryAfterError = false
- this.error = ''
-
- this.notifier.info($localize`Upload cancelled`)
- }
-
- uploadFirstStep (clickedOnButton = false) {
- const videofile = this.getVideoFile()
- if (!videofile) return
-
- if (!this.checkGlobalUserQuota(videofile)) return
- if (!this.checkDailyUserQuota(videofile)) return
-
- if (clickedOnButton === false && this.isAudioFile(videofile.name)) {
- this.isUploadingAudioFile = true
- return
- }
-
- // Build name field
- const nameWithoutExtension = videofile.name.replace(/\.[^/.]+$/, '')
- let name: string
-
- // If the name of the file is very small, keep the extension
- if (nameWithoutExtension.length < 3) name = videofile.name
- else name = nameWithoutExtension
-
- const nsfw = this.serverConfig.instance.isNSFW
- const waitTranscoding = true
- const commentsEnabled = true
- const downloadEnabled = true
- const channelId = this.firstStepChannelId.toString()
-
- this.formData = new FormData()
- this.formData.append('name', name)
- // Put the video "private" -> we are waiting the user validation of the second step
- this.formData.append('privacy', VideoPrivacy.PRIVATE.toString())
- this.formData.append('nsfw', '' + nsfw)
- this.formData.append('commentsEnabled', '' + commentsEnabled)
- this.formData.append('downloadEnabled', '' + downloadEnabled)
- this.formData.append('waitTranscoding', '' + waitTranscoding)
- this.formData.append('channelId', '' + channelId)
- this.formData.append('videofile', videofile)
-
- if (this.previewfileUpload) {
- this.formData.append('previewfile', this.previewfileUpload)
- this.formData.append('thumbnailfile', this.previewfileUpload)
- }
-
- this.isUploadingVideo = true
- this.firstStepDone.emit(name)
-
- this.form.patchValue({
- name,
- privacy: this.firstStepPrivacyId,
- nsfw,
- channelId: this.firstStepChannelId,
- previewfile: this.previewfileUpload
- })
-
- this.uploadVideo()
- }
-
- uploadVideo () {
- this.videoUploadObservable = this.videoService.uploadVideo(this.formData).subscribe(
- event => {
- if (event.type === HttpEventType.UploadProgress) {
- this.videoUploadPercents = Math.round(100 * event.loaded / event.total)
- } else if (event instanceof HttpResponse) {
- this.videoUploaded = true
-
- this.videoUploadedIds = event.body.video
-
- this.videoUploadObservable = null
- }
- },
-
- (err: HttpErrorResponse) => {
- // Reset progress (but keep isUploadingVideo true)
- this.videoUploadPercents = 0
- this.videoUploadObservable = null
- this.enableRetryAfterError = true
-
- this.error = uploadErrorHandler({
- err,
- name: $localize`video`,
- notifier: this.notifier,
- sticky: false
- })
-
- if (err.status === HttpStatusCode.PAYLOAD_TOO_LARGE_413 ||
- err.status === HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415) {
- this.cancelUpload()
- }
- }
- )
+ this.resumableUploadService.control({ action: 'cancel' })
}
isPublishingButtonDisabled () {
@@ -245,6 +218,13 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
!this.videoUploadedIds.id
}
+ getAudioUploadLabel () {
+ const videofile = this.getInputVideoFile()
+ if (!videofile) return $localize`Upload`
+
+ return $localize`Upload ${videofile.name}`
+ }
+
updateSecondStep () {
if (this.isPublishingButtonDisabled() || !this.checkForm()) {
return
@@ -275,6 +255,62 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
)
}
+ private getInputVideoFile () {
+ return this.videofileInput.nativeElement.files[0]
+ }
+
+ private uploadFile (file: File, previewfile?: File) {
+ const metadata = {
+ waitTranscoding: true,
+ commentsEnabled: true,
+ downloadEnabled: true,
+ channelId: this.firstStepChannelId,
+ nsfw: this.serverConfig.instance.isNSFW,
+ privacy: VideoPrivacy.PRIVATE.toString(),
+ filename: file.name,
+ previewfile: previewfile as any
+ }
+
+ this.resumableUploadService.handleFiles(file, {
+ ...this.uploadxOptions,
+ metadata
+ })
+
+ this.isUploadingVideo = true
+ }
+
+ private handleUploadError (err: HttpErrorResponse) {
+ // Reset progress (but keep isUploadingVideo true)
+ this.videoUploadPercents = 0
+ this.enableRetryAfterError = true
+
+ this.error = genericUploadErrorHandler({
+ err,
+ name: $localize`video`,
+ notifier: this.notifier,
+ sticky: false
+ })
+
+ if (err.status === HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415) {
+ this.cancelUpload()
+ }
+ }
+
+ private closeFirstStep (filename: string) {
+ const nameWithoutExtension = filename.replace(/\.[^/.]+$/, '')
+ const name = nameWithoutExtension.length < 3 ? filename : nameWithoutExtension
+
+ this.form.patchValue({
+ name,
+ privacy: this.firstStepPrivacyId,
+ nsfw: this.serverConfig.instance.isNSFW,
+ channelId: this.firstStepChannelId,
+ previewfile: this.previewfileUpload
+ })
+
+ this.firstStepDone.emit(name)
+ }
+
private checkGlobalUserQuota (videofile: File) {
const bytePipes = new BytesPipe()
@@ -285,8 +321,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, AfterView
const videoQuotaUsedBytes = bytePipes.transform(this.userVideoQuotaUsed, 0)
const videoQuotaBytes = bytePipes.transform(videoQuota, 0)
- const msg = $localize`Your video quota is exceeded with this video (
-video size: ${videoSizeBytes}, used: ${videoQuotaUsedBytes}, quota: ${videoQuotaBytes})`
+ const msg = $localize`Your video quota is exceeded with this video (video size: ${videoSizeBytes}, used: ${videoQuotaUsedBytes}, quota: ${videoQuotaBytes})`
this.notifier.error(msg)
return false
@@ -304,9 +339,7 @@ video size: ${videoSizeBytes}, used: ${videoQuotaUsedBytes}, quota: ${videoQuota
const videoSizeBytes = bytePipes.transform(videofile.size, 0)
const quotaUsedDailyBytes = bytePipes.transform(this.userVideoQuotaUsedDaily, 0)
const quotaDailyBytes = bytePipes.transform(videoQuotaDaily, 0)
-
- const msg = $localize`Your daily video quota is exceeded with this video (
-video size: ${videoSizeBytes}, used: ${quotaUsedDailyBytes}, quota: ${quotaDailyBytes})`
+ const msg = $localize`Your daily video quota is exceeded with this video (video size: ${videoSizeBytes}, used: ${quotaUsedDailyBytes}, quota: ${quotaDailyBytes})`
this.notifier.error(msg)
return false
diff --git a/client/src/app/+videos/+video-edit/video-add-routing.module.ts b/client/src/app/+videos/+video-edit/video-add-routing.module.ts
index 9ff66bea0..3b9a5ab3a 100644
--- a/client/src/app/+videos/+video-edit/video-add-routing.module.ts
+++ b/client/src/app/+videos/+video-edit/video-add-routing.module.ts
@@ -1,14 +1,13 @@
import { NgModule } from '@angular/core'
import { RouterModule, Routes } from '@angular/router'
import { CanDeactivateGuard, LoginGuard } from '@app/core'
-import { MetaGuard } from '@ngx-meta/core'
import { VideoAddComponent } from './video-add.component'
const videoAddRoutes: Routes = [
{
path: '',
component: VideoAddComponent,
- canActivate: [ MetaGuard, LoginGuard ],
+ canActivate: [ LoginGuard ],
canDeactivate: [ CanDeactivateGuard ]
}
]
diff --git a/client/src/app/+videos/+video-edit/video-add.component.html b/client/src/app/+videos/+video-edit/video-add.component.html
index dc8c2f21d..ac75d9ff8 100644
--- a/client/src/app/+videos/+video-edit/video-add.component.html
+++ b/client/src/app/+videos/+video-edit/video-add.component.html
@@ -20,8 +20,8 @@
Upload {{ videoName }}
-
-
+
+
Upload a file
@@ -31,7 +31,7 @@
-
+
Import with URL
@@ -41,7 +41,7 @@
-
+
Import with torrent
@@ -51,7 +51,7 @@
-
+
Go live
diff --git a/client/src/app/+videos/+video-edit/video-add.component.ts b/client/src/app/+videos/+video-edit/video-add.component.ts
index 441d5a3db..d735c936c 100644
--- a/client/src/app/+videos/+video-edit/video-add.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add.component.ts
@@ -1,4 +1,5 @@
import { Component, HostListener, OnInit, ViewChild } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
import { AuthService, AuthUser, CanComponentDeactivate, ServerService } from '@app/core'
import { ServerConfig } from '@shared/models'
import { VideoEditType } from './shared/video-edit.type'
@@ -22,11 +23,16 @@ export class VideoAddComponent implements OnInit, CanComponentDeactivate {
secondStepType: VideoEditType
videoName: string
- serverConfig: ServerConfig
+
+ activeNav: string
+
+ private serverConfig: ServerConfig
constructor (
private auth: AuthService,
- private serverService: ServerService
+ private serverService: ServerService,
+ private route: ActivatedRoute,
+ private router: Router
) {}
get userInformationLoaded () {
@@ -42,6 +48,16 @@ export class VideoAddComponent implements OnInit, CanComponentDeactivate {
.subscribe(config => this.serverConfig = config)
this.user = this.auth.getUser()
+
+ if (this.route.snapshot.fragment) {
+ this.onNavChange(this.route.snapshot.fragment)
+ }
+ }
+
+ onNavChange (newActiveNav: string) {
+ this.activeNav = newActiveNav
+
+ this.router.navigate([], { fragment: this.activeNav })
}
onFirstStepDone (type: VideoEditType, videoName: string) {
diff --git a/client/src/app/+videos/+video-edit/video-add.module.ts b/client/src/app/+videos/+video-edit/video-add.module.ts
index da651119b..e836cf81e 100644
--- a/client/src/app/+videos/+video-edit/video-add.module.ts
+++ b/client/src/app/+videos/+video-edit/video-add.module.ts
@@ -1,5 +1,6 @@
import { NgModule } from '@angular/core'
import { CanDeactivateGuard } from '@app/core'
+import { UploadxModule } from 'ngx-uploadx'
import { VideoEditModule } from './shared/video-edit.module'
import { DragDropDirective } from './video-add-components/drag-drop.directive'
import { VideoImportTorrentComponent } from './video-add-components/video-import-torrent.component'
@@ -13,7 +14,9 @@ import { VideoAddComponent } from './video-add.component'
imports: [
VideoAddRoutingModule,
- VideoEditModule
+ VideoEditModule,
+
+ UploadxModule
],
declarations: [
diff --git a/client/src/app/+videos/+video-edit/video-update-routing.module.ts b/client/src/app/+videos/+video-edit/video-update-routing.module.ts
index a04351b05..ba9167dd0 100644
--- a/client/src/app/+videos/+video-edit/video-update-routing.module.ts
+++ b/client/src/app/+videos/+video-edit/video-update-routing.module.ts
@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'
import { RouterModule, Routes } from '@angular/router'
import { CanDeactivateGuard, LoginGuard } from '@app/core'
-import { MetaGuard } from '@ngx-meta/core'
import { VideoUpdateComponent } from './video-update.component'
import { VideoUpdateResolver } from './video-update.resolver'
@@ -9,7 +8,7 @@ const videoUpdateRoutes: Routes = [
{
path: '',
component: VideoUpdateComponent,
- canActivate: [ MetaGuard, LoginGuard ],
+ canActivate: [ LoginGuard ],
canDeactivate: [ CanDeactivateGuard ],
resolve: {
videoData: VideoUpdateResolver
diff --git a/client/src/app/+videos/+video-edit/video-update.resolver.ts b/client/src/app/+videos/+video-edit/video-update.resolver.ts
index 276548b79..9172b78a8 100644
--- a/client/src/app/+videos/+video-edit/video-update.resolver.ts
+++ b/client/src/app/+videos/+video-edit/video-update.resolver.ts
@@ -2,7 +2,9 @@ import { forkJoin, of } from 'rxjs'
import { map, switchMap } from 'rxjs/operators'
import { Injectable } from '@angular/core'
import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
-import { VideoCaptionService, VideoChannelService, VideoDetails, VideoService } from '@app/shared/shared-main'
+import { AuthService } from '@app/core'
+import { listUserChannels } from '@app/helpers'
+import { VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main'
import { LiveVideoService } from '@app/shared/shared-video-live'
@Injectable()
@@ -10,7 +12,7 @@ export class VideoUpdateResolver implements Resolve {
constructor (
private videoService: VideoService,
private liveVideoService: LiveVideoService,
- private videoChannelService: VideoChannelService,
+ private authService: AuthService,
private videoCaptionService: VideoCaptionService
) {
}
@@ -31,17 +33,7 @@ export class VideoUpdateResolver implements Resolve {
.loadCompleteDescription(video.descriptionPath)
.pipe(map(description => Object.assign(video, { description }))),
- this.videoChannelService
- .listAccountVideoChannels(video.account)
- .pipe(
- map(result => result.data),
- map(videoChannels => videoChannels.map(c => ({
- id: c.id,
- label: c.displayName,
- support: c.support,
- avatarPath: c.avatar?.path
- })))
- ),
+ listUserChannels(this.authService),
this.videoCaptionService
.listCaptions(video.id)
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.ts b/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
index fd379e80e..04f8f0d58 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
@@ -161,7 +161,7 @@ export class VideoCommentComponent implements OnInit, OnChanges {
// Before HTML rendering restore line feed for markdown list compatibility
const commentText = this.comment.text.replace(//g, '\r\n')
const html = await this.markdownService.textMarkdownToHTML(commentText, true, true)
- this.sanitizedCommentHTML = await this.markdownService.processVideoTimestamps(html)
+ this.sanitizedCommentHTML = this.markdownService.processVideoTimestamps(html)
this.newParentComments = this.parentComments.concat([ this.comment ])
if (this.comment.account) {
diff --git a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
index d8fecb87d..cb77685c0 100644
--- a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
@@ -1,13 +1,11 @@
import { NgModule } from '@angular/core'
import { RouterModule, Routes } from '@angular/router'
-import { MetaGuard } from '@ngx-meta/core'
import { VideoWatchComponent } from './video-watch.component'
const videoWatchRoutes: Routes = [
{
path: 'playlist/:playlistId',
- component: VideoWatchComponent,
- canActivate: [ MetaGuard ]
+ component: VideoWatchComponent
},
{
path: ':videoId/comments/:commentId',
@@ -15,8 +13,7 @@ const videoWatchRoutes: Routes = [
},
{
path: ':videoId',
- component: VideoWatchComponent,
- canActivate: [ MetaGuard ]
+ component: VideoWatchComponent
}
]
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index 301762695..6124090c9 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
@@ -146,6 +146,8 @@ $video-info-margin-left: 44px;
}
.video-info-name {
+ @include peertube-word-wrap;
+
margin-right: 30px;
min-height: 40px; // Align with the action buttons
font-size: 27px;
@@ -173,6 +175,7 @@ $video-info-margin-left: 44px;
a {
@include disable-default-a-behaviour;
+ @include peertube-word-wrap;
color: pvar(--mainForegroundColor);
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 1c510d6b0..88c5cef52 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -9,6 +9,7 @@ import {
AuthUser,
ConfirmService,
MarkdownService,
+ MetaService,
Notifier,
PeerTubeSocket,
RestExtractor,
@@ -25,7 +26,6 @@ import { SupportModalComponent } from '@app/shared/shared-support-modal'
import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
import { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature'
import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
-import { MetaService } from '@ngx-meta/core'
import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
@@ -509,7 +509,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
private async setVideoDescriptionHTML () {
const html = await this.markdownService.textMarkdownToHTML(this.video.description)
- this.videoHTMLDescription = await this.markdownService.processVideoTimestamps(html)
+ this.videoHTMLDescription = this.markdownService.processVideoTimestamps(html)
}
private setVideoLikesBarTooltipText () {
@@ -674,7 +674,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.player.one('ended', () => {
if (this.video.isLive) {
- this.video.state.id = VideoState.LIVE_ENDED
+ this.zone.run(() => this.video.state.id = VideoState.LIVE_ENDED)
}
})
diff --git a/client/src/app/+videos/video-list/trending/video-trending-header.component.ts b/client/src/app/+videos/video-list/trending/video-trending-header.component.ts
index 55040f3c9..bbb02a236 100644
--- a/client/src/app/+videos/video-list/trending/video-trending-header.component.ts
+++ b/client/src/app/+videos/video-list/trending/video-trending-header.component.ts
@@ -31,7 +31,8 @@ export class VideoTrendingHeaderComponent extends VideoListHeaderComponent imple
private route: ActivatedRoute,
private router: Router,
private auth: AuthService,
- private serverService: ServerService
+ private serverService: ServerService,
+ private redirectService: RedirectService
) {
super(data)
@@ -84,12 +85,7 @@ export class VideoTrendingHeaderComponent extends VideoListHeaderComponent imple
this.algorithmChangeSub = this.route.queryParams.subscribe(
queryParams => {
- const algorithm = queryParams['alg']
- if (algorithm) {
- this.data.model = algorithm
- } else {
- this.data.model = RedirectService.DEFAULT_TRENDING_ALGORITHM
- }
+ this.data.model = queryParams['alg'] || this.redirectService.getDefaultTrendingAlgorithm()
}
)
}
@@ -99,7 +95,7 @@ export class VideoTrendingHeaderComponent extends VideoListHeaderComponent imple
}
setSort () {
- const alg = this.data.model !== RedirectService.DEFAULT_TRENDING_ALGORITHM
+ const alg = this.data.model !== this.redirectService.getDefaultTrendingAlgorithm()
? this.data.model
: undefined
diff --git a/client/src/app/+videos/video-list/trending/video-trending.component.ts b/client/src/app/+videos/video-list/trending/video-trending.component.ts
index e50d6ec3a..ebec672f3 100644
--- a/client/src/app/+videos/video-list/trending/video-trending.component.ts
+++ b/client/src/app/+videos/video-list/trending/video-trending.component.ts
@@ -35,11 +35,12 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit,
protected storageService: LocalStorageService,
protected cfr: ComponentFactoryResolver,
private videoService: VideoService,
+ private redirectService: RedirectService,
private hooks: HooksService
) {
super()
- this.defaultSort = this.parseAlgorithm(RedirectService.DEFAULT_TRENDING_ALGORITHM)
+ this.defaultSort = this.parseAlgorithm(this.redirectService.getDefaultTrendingAlgorithm())
this.headerComponentInjector = this.getInjector()
}
@@ -106,7 +107,7 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit,
}
protected loadPageRouteParams (queryParams: Params) {
- const algorithm = queryParams['alg'] || RedirectService.DEFAULT_TRENDING_ALGORITHM
+ const algorithm = queryParams['alg'] || this.redirectService.getDefaultTrendingAlgorithm()
this.sort = this.parseAlgorithm(algorithm)
}
@@ -115,8 +116,10 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit,
switch (algorithm) {
case 'most-viewed':
return '-trending'
+
case 'most-liked':
return '-likes'
+
default:
return '-' + algorithm as VideoSortField
}
diff --git a/client/src/app/+videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts
index 16e3b9bb2..f9f476b18 100644
--- a/client/src/app/+videos/videos-routing.module.ts
+++ b/client/src/app/+videos/videos-routing.module.ts
@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'
import { RouterModule, Routes } from '@angular/router'
import { LoginGuard } from '@app/core'
-import { MetaGuard } from '@ngx-meta/core'
import { VideoTrendingComponent } from './video-list'
import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
import { VideoLocalComponent } from './video-list/video-local.component'
@@ -13,7 +12,6 @@ const videosRoutes: Routes = [
{
path: '',
component: VideosComponent,
- canActivateChild: [ MetaGuard ],
children: [
{
path: 'overview',
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 0a43ab0ad..4619c4046 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -3,7 +3,7 @@ import { RouteReuseStrategy, RouterModule, Routes, UrlMatchResult, UrlSegment }
import { CustomReuseStrategy } from '@app/core/routing/custom-reuse-strategy'
import { MenuGuards } from '@app/core/routing/menu-guard.service'
import { POSSIBLE_LOCALES } from '@shared/core-utils/i18n'
-import { PreloadSelectedModulesList } from './core'
+import { MetaGuard, PreloadSelectedModulesList } from './core'
import { EmptyComponent } from './empty.component'
import { RootComponent } from './root.component'
@@ -12,55 +12,72 @@ const routes: Routes = [
path: 'admin',
canActivate: [ MenuGuards.close() ],
canDeactivate: [ MenuGuards.open() ],
- loadChildren: () => import('./+admin/admin.module').then(m => m.AdminModule)
+ loadChildren: () => import('./+admin/admin.module').then(m => m.AdminModule),
+ canActivateChild: [ MetaGuard ]
+ },
+ {
+ path: 'home',
+ loadChildren: () => import('./+home/home.module').then(m => m.HomeModule)
},
{
path: 'my-account',
- loadChildren: () => import('./+my-account/my-account.module').then(m => m.MyAccountModule)
+ loadChildren: () => import('./+my-account/my-account.module').then(m => m.MyAccountModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'my-library',
- loadChildren: () => import('./+my-library/my-library.module').then(m => m.MyLibraryModule)
+ loadChildren: () => import('./+my-library/my-library.module').then(m => m.MyLibraryModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'verify-account',
- loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule)
+ loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'a',
- loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule)
+ loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'c',
- loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule)
+ loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'about',
- loadChildren: () => import('./+about/about.module').then(m => m.AboutModule)
+ loadChildren: () => import('./+about/about.module').then(m => m.AboutModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'signup',
- loadChildren: () => import('./+signup/+register/register.module').then(m => m.RegisterModule)
+ loadChildren: () => import('./+signup/+register/register.module').then(m => m.RegisterModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'reset-password',
- loadChildren: () => import('./+reset-password/reset-password.module').then(m => m.ResetPasswordModule)
+ loadChildren: () => import('./+reset-password/reset-password.module').then(m => m.ResetPasswordModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'login',
- loadChildren: () => import('./+login/login.module').then(m => m.LoginModule)
+ loadChildren: () => import('./+login/login.module').then(m => m.LoginModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'search',
- loadChildren: () => import('./+search/search.module').then(m => m.SearchModule)
+ loadChildren: () => import('./+search/search.module').then(m => m.SearchModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'videos',
- loadChildren: () => import('./+videos/videos.module').then(m => m.VideosModule)
+ loadChildren: () => import('./+videos/videos.module').then(m => m.VideosModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'remote-interaction',
- loadChildren: () => import('./+remote-interaction/remote-interaction.module').then(m => m.RemoteInteractionModule)
+ loadChildren: () => import('./+remote-interaction/remote-interaction.module').then(m => m.RemoteInteractionModule),
+ canActivateChild: [ MetaGuard ]
},
{
path: 'video-playlists/watch',
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index e21ada0f1..0543564b4 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -40,8 +40,10 @@
}
.icon-menu {
- background-color: pvar(--mainForegroundColor);
mask-image: url('../assets/images/misc/menu.svg');
+ -webkit-mask-image: url('../assets/images/misc/menu.svg');
+
+ background-color: pvar(--mainForegroundColor);
margin: 0 18px 0 20px;
@media screen and (max-width: $mobile-view) {
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 66d871b4a..863c3f3b5 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -67,7 +67,7 @@ export class AppComponent implements OnInit, AfterViewInit {
}
goToDefaultRoute () {
- return this.router.navigateByUrl(RedirectService.DEFAULT_ROUTE)
+ return this.router.navigateByUrl(this.redirectService.getDefaultRoute())
}
ngOnInit () {
@@ -231,7 +231,7 @@ export class AppComponent implements OnInit, AfterViewInit {
}
this.broadcastMessage = {
- message: await this.markdownService.completeMarkdownToHTML(messageConfig.message),
+ message: await this.markdownService.unsafeMarkdownToHTML(messageConfig.message, true),
dismissable: messageConfig.dismissable,
class: classes[messageConfig.level]
}
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 3cec6d739..9f46d49a2 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -4,9 +4,7 @@ import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
import { NgModule } from '@angular/core'
import { BrowserModule } from '@angular/platform-browser'
import { ServiceWorkerModule } from '@angular/service-worker'
-import { ServerService } from '@app/core'
import localeOc from '@app/helpers/locales/oc'
-import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
import { AppRoutingModule } from './app-routing.module'
import { AppComponent } from './app.component'
import { CoreModule } from './core'
@@ -19,12 +17,12 @@ import { CustomModalComponent } from './modal/custom-modal.component'
import { InstanceConfigWarningModalComponent } from './modal/instance-config-warning-modal.component'
import { QuickSettingsModalComponent } from './modal/quick-settings-modal.component'
import { WelcomeModalComponent } from './modal/welcome-modal.component'
+import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
import { SharedFormModule } from './shared/shared-forms'
import { SharedGlobalIconModule } from './shared/shared-icons'
import { SharedInstanceModule } from './shared/shared-instance'
import { SharedMainModule } from './shared/shared-main'
import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings'
-import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
registerLocaleData(localeOc, 'oc')
@@ -62,22 +60,6 @@ registerLocaleData(localeOc, 'oc')
SharedInstanceModule,
SharedActorImageModule,
- MetaModule.forRoot({
- provide: MetaLoader,
- useFactory: (serverService: ServerService) => {
- return new MetaStaticLoader({
- pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
- pageTitleSeparator: ' - ',
- get applicationName () { return serverService.getTmpConfig().instance.name },
- defaults: {
- get title () { return serverService.getTmpConfig().instance.name },
- get description () { return serverService.getTmpConfig().instance.shortDescription }
- }
- })
- },
- deps: [ ServerService ]
- }),
-
AppRoutingModule // Put it after all the module because it has the 404 route
],
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 3152a7003..de3274544 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -14,7 +14,7 @@ import { throwIfAlreadyLoaded } from './module-import-guard'
import { Notifier } from './notification'
import { HtmlRendererService, LinkifierService, MarkdownService } from './renderer'
import { RestExtractor, RestService } from './rest'
-import { LoginGuard, RedirectService, UnloggedGuard, UserRightGuard } from './routing'
+import { LoginGuard, MetaGuard, MetaService, RedirectService, UnloggedGuard, UserRightGuard } from './routing'
import { CanDeactivateGuard } from './routing/can-deactivate-guard.service'
import { ServerConfigResolver } from './routing/server-config-resolver.service'
import { ScopedTokensService } from './scoped-tokens'
@@ -77,7 +77,10 @@ import { LocalStorageService, ScreenService, SessionStorageService } from './wra
MessageService,
PeerTubeSocket,
ServerConfigResolver,
- CanDeactivateGuard
+ CanDeactivateGuard,
+
+ MetaService,
+ MetaGuard
]
})
export class CoreModule {
diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts
index 502d3bb2f..77592cbb6 100644
--- a/client/src/app/core/menu/menu.service.ts
+++ b/client/src/app/core/menu/menu.service.ts
@@ -1,8 +1,19 @@
import { fromEvent } from 'rxjs'
import { debounceTime } from 'rxjs/operators'
import { Injectable } from '@angular/core'
+import { GlobalIconName } from '@app/shared/shared-icons'
+import { sortObjectComparator } from '@shared/core-utils/miscs/miscs'
+import { ServerConfig } from '@shared/models/server'
import { ScreenService } from '../wrappers'
+export type MenuLink = {
+ icon: GlobalIconName
+ label: string
+ menuLabel: string
+ path: string
+ priority: number
+}
+
@Injectable()
export class MenuService {
isMenuDisplayed = true
@@ -48,6 +59,53 @@ export class MenuService {
this.isMenuDisplayed = window.innerWidth >= 800 && !this.isMenuChangedByUser
}
+ buildCommonLinks (config: ServerConfig) {
+ let entries: MenuLink[] = [
+ {
+ icon: 'globe' as 'globe',
+ label: $localize`Discover videos`,
+ menuLabel: $localize`Discover`,
+ path: '/videos/overview',
+ priority: 150
+ },
+ {
+ icon: 'trending' as 'trending',
+ label: $localize`Trending videos`,
+ menuLabel: $localize`Trending`,
+ path: '/videos/trending',
+ priority: 140
+ },
+ {
+ icon: 'recently-added' as 'recently-added',
+ label: $localize`Recently added videos`,
+ menuLabel: $localize`Recently added`,
+ path: '/videos/recently-added',
+ priority: 130
+ },
+ {
+ icon: 'octagon' as 'octagon',
+ label: $localize`Local videos`,
+ menuLabel: $localize`Local videos`,
+ path: '/videos/local',
+ priority: 120
+ }
+ ]
+
+ if (config.homepage.enabled) {
+ entries.push({
+ icon: 'home' as 'home',
+ label: $localize`Home`,
+ menuLabel: $localize`Home`,
+ path: '/home',
+ priority: 160
+ })
+ }
+
+ entries = entries.sort(sortObjectComparator('priority', 'desc'))
+
+ return entries
+ }
+
private handleWindowResize () {
// On touch screens, do not handle window resize event since opened menu is handled with a content overlay
if (this.screenService.isInTouchScreen()) return
diff --git a/client/src/app/core/renderer/html-renderer.service.ts b/client/src/app/core/renderer/html-renderer.service.ts
index 3176cf6a4..418d8603e 100644
--- a/client/src/app/core/renderer/html-renderer.service.ts
+++ b/client/src/app/core/renderer/html-renderer.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core'
import { LinkifierService } from './linkifier.service'
-import { SANITIZE_OPTIONS } from '@shared/core-utils/renderer/html'
+import { getCustomMarkupSanitizeOptions, getSanitizeOptions } from '@shared/core-utils/renderer/html'
@Injectable()
export class HtmlRendererService {
@@ -20,7 +20,7 @@ export class HtmlRendererService {
})
}
- async toSafeHtml (text: string) {
+ async toSafeHtml (text: string, additionalAllowedTags: string[] = []) {
const [ html ] = await Promise.all([
// Convert possible markdown to html
this.linkifier.linkify(text),
@@ -28,7 +28,11 @@ export class HtmlRendererService {
this.loadSanitizeHtml()
])
- return this.sanitizeHtml(html, SANITIZE_OPTIONS)
+ const options = additionalAllowedTags.length !== 0
+ ? getCustomMarkupSanitizeOptions(additionalAllowedTags)
+ : getSanitizeOptions()
+
+ return this.sanitizeHtml(html, options)
}
private async loadSanitizeHtml () {
diff --git a/client/src/app/core/renderer/markdown.service.ts b/client/src/app/core/renderer/markdown.service.ts
index edddb0a66..ca1bf4eb9 100644
--- a/client/src/app/core/renderer/markdown.service.ts
+++ b/client/src/app/core/renderer/markdown.service.ts
@@ -17,12 +17,15 @@ type MarkdownParsers = {
enhancedMarkdownIt: MarkdownIt
enhancedWithHTMLMarkdownIt: MarkdownIt
- completeMarkdownIt: MarkdownIt
+ unsafeMarkdownIt: MarkdownIt
+
+ customPageMarkdownIt: MarkdownIt
}
type MarkdownConfig = {
rules: string[]
html: boolean
+ breaks: boolean
escape?: boolean
}
@@ -35,18 +38,24 @@ export class MarkdownService {
private markdownParsers: MarkdownParsers = {
textMarkdownIt: null,
textWithHTMLMarkdownIt: null,
+
enhancedMarkdownIt: null,
enhancedWithHTMLMarkdownIt: null,
- completeMarkdownIt: null
+
+ unsafeMarkdownIt: null,
+
+ customPageMarkdownIt: null
}
private parsersConfig: MarkdownParserConfigs = {
- textMarkdownIt: { rules: TEXT_RULES, html: false },
- textWithHTMLMarkdownIt: { rules: TEXT_WITH_HTML_RULES, html: true, escape: true },
+ textMarkdownIt: { rules: TEXT_RULES, breaks: true, html: false },
+ textWithHTMLMarkdownIt: { rules: TEXT_WITH_HTML_RULES, breaks: true, html: true, escape: true },
- enhancedMarkdownIt: { rules: ENHANCED_RULES, html: false },
- enhancedWithHTMLMarkdownIt: { rules: ENHANCED_WITH_HTML_RULES, html: true, escape: true },
+ enhancedMarkdownIt: { rules: ENHANCED_RULES, breaks: true, html: false },
+ enhancedWithHTMLMarkdownIt: { rules: ENHANCED_WITH_HTML_RULES, breaks: true, html: true, escape: true },
- completeMarkdownIt: { rules: COMPLETE_RULES, html: true }
+ unsafeMarkdownIt: { rules: COMPLETE_RULES, breaks: true, html: true, escape: false },
+
+ customPageMarkdownIt: { rules: COMPLETE_RULES, breaks: false, html: true, escape: true }
}
private emojiModule: any
@@ -54,22 +63,26 @@ export class MarkdownService {
constructor (private htmlRenderer: HtmlRendererService) {}
textMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) {
- if (withHtml) return this.render('textWithHTMLMarkdownIt', markdown, withEmoji)
+ if (withHtml) return this.render({ name: 'textWithHTMLMarkdownIt', markdown, withEmoji })
- return this.render('textMarkdownIt', markdown, withEmoji)
+ return this.render({ name: 'textMarkdownIt', markdown, withEmoji })
}
enhancedMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) {
- if (withHtml) return this.render('enhancedWithHTMLMarkdownIt', markdown, withEmoji)
+ if (withHtml) return this.render({ name: 'enhancedWithHTMLMarkdownIt', markdown, withEmoji })
- return this.render('enhancedMarkdownIt', markdown, withEmoji)
+ return this.render({ name: 'enhancedMarkdownIt', markdown, withEmoji })
}
- completeMarkdownToHTML (markdown: string) {
- return this.render('completeMarkdownIt', markdown, true)
+ unsafeMarkdownToHTML (markdown: string, _trustedInput: true) {
+ return this.render({ name: 'unsafeMarkdownIt', markdown, withEmoji: true })
}
- async processVideoTimestamps (html: string) {
+ customPageMarkdownToHTML (markdown: string, additionalAllowedTags: string[]) {
+ return this.render({ name: 'customPageMarkdownIt', markdown, withEmoji: true, additionalAllowedTags })
+ }
+
+ processVideoTimestamps (html: string) {
return html.replace(/((\d{1,2}):)?(\d{1,2}):(\d{1,2})/g, function (str, _, h, m, s) {
const t = (3600 * +(h || 0)) + (60 * +(m || 0)) + (+(s || 0))
const url = buildVideoLink({ startTime: t })
@@ -77,7 +90,13 @@ export class MarkdownService {
})
}
- private async render (name: keyof MarkdownParsers, markdown: string, withEmoji = false) {
+ private async render (options: {
+ name: keyof MarkdownParsers
+ markdown: string
+ withEmoji: boolean
+ additionalAllowedTags?: string[]
+ }) {
+ const { name, markdown, withEmoji, additionalAllowedTags } = options
if (!markdown) return ''
const config = this.parsersConfig[ name ]
@@ -96,7 +115,7 @@ export class MarkdownService {
let html = this.markdownParsers[ name ].render(markdown)
html = this.avoidTruncatedTags(html)
- if (config.escape) return this.htmlRenderer.toSafeHtml(html)
+ if (config.escape) return this.htmlRenderer.toSafeHtml(html, additionalAllowedTags)
return html
}
@@ -105,7 +124,7 @@ export class MarkdownService {
// FIXME: import('...') returns a struct module, containing a "default" field
const MarkdownItClass: typeof import ('markdown-it') = (await import('markdown-it') as any).default
- const markdownIt = new MarkdownItClass('zero', { linkify: true, breaks: true, html: config.html })
+ const markdownIt = new MarkdownItClass('zero', { linkify: true, breaks: config.breaks, html: config.html })
for (const rule of config.rules) {
markdownIt.enable(rule)
diff --git a/client/src/app/core/routing/index.ts b/client/src/app/core/routing/index.ts
index 239c27caf..4314ea475 100644
--- a/client/src/app/core/routing/index.ts
+++ b/client/src/app/core/routing/index.ts
@@ -3,6 +3,8 @@ export * from './custom-reuse-strategy'
export * from './disable-for-reuse-hook'
export * from './login-guard.service'
export * from './menu-guard.service'
+export * from './meta-guard.service'
+export * from './meta.service'
export * from './preload-selected-modules-list'
export * from './redirect.service'
export * from './server-config-resolver.service'
diff --git a/client/src/app/core/routing/meta-guard.service.ts b/client/src/app/core/routing/meta-guard.service.ts
new file mode 100644
index 000000000..bedb3450e
--- /dev/null
+++ b/client/src/app/core/routing/meta-guard.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core'
+import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, RouterStateSnapshot } from '@angular/router'
+import { MetaService } from './meta.service'
+
+@Injectable()
+export class MetaGuard implements CanActivate, CanActivateChild {
+
+ constructor (private meta: MetaService) { }
+
+ canActivate (route: ActivatedRouteSnapshot): boolean {
+ const metaSettings = route.data?.meta
+
+ if (metaSettings) {
+ this.meta.update(metaSettings)
+ }
+
+ return true
+ }
+
+ canActivateChild (route: ActivatedRouteSnapshot): boolean {
+ return this.canActivate(route)
+ }
+}
diff --git a/client/src/app/core/routing/meta.service.ts b/client/src/app/core/routing/meta.service.ts
new file mode 100644
index 000000000..a5ac778dc
--- /dev/null
+++ b/client/src/app/core/routing/meta.service.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core'
+import { Meta, Title } from '@angular/platform-browser'
+import { HTMLServerConfig } from '@shared/models/server'
+import { ServerService } from '../server'
+
+export interface MetaSettings {
+ title?: string
+}
+
+@Injectable()
+export class MetaService {
+ private config: HTMLServerConfig
+
+ constructor (
+ private titleService: Title,
+ private meta: Meta,
+ private server: ServerService
+ ) {
+ this.config = this.server.getTmpConfig()
+ this.server.getConfig()
+ .subscribe(config => this.config = config)
+ }
+
+ setTitle (subTitle?: string) {
+ let title = ''
+ if (subTitle) title += `${subTitle} - `
+
+ title += this.config.instance.name
+
+ this.titleService.setTitle(title)
+ }
+
+ setTag (name: string, value: string) {
+ this.meta.addTag({ name, content: value })
+ }
+
+ update (meta: MetaSettings) {
+ this.setTitle(meta.title)
+ }
+}
diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index 6d26fb504..cf690a4d0 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -6,14 +6,14 @@ import { ServerService } from '../server'
export class RedirectService {
// Default route could change according to the instance configuration
static INIT_DEFAULT_ROUTE = '/videos/trending'
- static DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
static INIT_DEFAULT_TRENDING_ALGORITHM = 'most-viewed'
- static DEFAULT_TRENDING_ALGORITHM = RedirectService.INIT_DEFAULT_TRENDING_ALGORITHM
private previousUrl: string
private currentUrl: string
private redirectingToHomepage = false
+ private defaultTrendingAlgorithm = RedirectService.INIT_DEFAULT_TRENDING_ALGORITHM
+ private defaultRoute = RedirectService.INIT_DEFAULT_ROUTE
constructor (
private router: Router,
@@ -22,10 +22,10 @@ export class RedirectService {
// The config is first loaded from the cache so try to get the default route
const tmpConfig = this.serverService.getTmpConfig()
if (tmpConfig?.instance?.defaultClientRoute) {
- RedirectService.DEFAULT_ROUTE = tmpConfig.instance.defaultClientRoute
+ this.defaultRoute = tmpConfig.instance.defaultClientRoute
}
if (tmpConfig?.trending?.videos?.algorithms?.default) {
- RedirectService.DEFAULT_TRENDING_ALGORITHM = tmpConfig.trending.videos.algorithms.default
+ this.defaultTrendingAlgorithm = tmpConfig.trending.videos.algorithms.default
}
// Load default route
@@ -34,13 +34,8 @@ export class RedirectService {
const defaultRouteConfig = config.instance.defaultClientRoute
const defaultTrendingConfig = config.trending.videos.algorithms.default
- if (defaultRouteConfig) {
- RedirectService.DEFAULT_ROUTE = defaultRouteConfig
- }
-
- if (defaultTrendingConfig) {
- RedirectService.DEFAULT_TRENDING_ALGORITHM = defaultTrendingConfig
- }
+ if (defaultRouteConfig) this.defaultRoute = defaultRouteConfig
+ if (defaultTrendingConfig) this.defaultTrendingAlgorithm = defaultTrendingConfig
})
// Track previous url
@@ -53,6 +48,14 @@ export class RedirectService {
})
}
+ getDefaultRoute () {
+ return this.defaultRoute
+ }
+
+ getDefaultTrendingAlgorithm () {
+ return this.defaultTrendingAlgorithm
+ }
+
redirectToPreviousRoute () {
const exceptions = [
'/verify-account',
@@ -72,21 +75,21 @@ export class RedirectService {
this.redirectingToHomepage = true
- console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
+ console.log('Redirecting to %s...', this.defaultRoute)
- this.router.navigateByUrl(RedirectService.DEFAULT_ROUTE, { skipLocationChange })
+ this.router.navigateByUrl(this.defaultRoute, { skipLocationChange })
.then(() => this.redirectingToHomepage = false)
.catch(() => {
this.redirectingToHomepage = false
console.error(
'Cannot navigate to %s, resetting default route to %s.',
- RedirectService.DEFAULT_ROUTE,
+ this.defaultRoute,
RedirectService.INIT_DEFAULT_ROUTE
)
- RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
- return this.router.navigateByUrl(RedirectService.DEFAULT_ROUTE, { skipLocationChange })
+ this.defaultRoute = RedirectService.INIT_DEFAULT_ROUTE
+ return this.router.navigateByUrl(this.defaultRoute, { skipLocationChange })
})
}
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 906191ae1..5b1b7603f 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -3,7 +3,6 @@ import { first, map, share, shareReplay, switchMap, tap } from 'rxjs/operators'
import { HttpClient } from '@angular/common/http'
import { Inject, Injectable, LOCALE_ID } from '@angular/core'
import { getDevLocale, isOnDevLocale, sortBy } from '@app/helpers'
-import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
import { getCompleteLocale, isDefaultLocale, peertubeTranslate } from '@shared/core-utils/i18n'
import { SearchTargetType, ServerConfig, ServerStats, VideoConstant } from '@shared/models'
import { environment } from '../../../environments/environment'
@@ -16,8 +15,6 @@ export class ServerService {
private static BASE_LOCALE_URL = environment.apiUrl + '/client/locales/'
private static BASE_STATS_URL = environment.apiUrl + '/api/v1/server/stats'
- private static CONFIG_LOCAL_STORAGE_KEY = 'server-config'
-
configReloaded = new Subject()
private localeObservable: Observable
@@ -176,6 +173,9 @@ export class ServerService {
disableLocalSearch: false,
isDefaultSearch: false
}
+ },
+ homepage: {
+ enabled: false
}
}
@@ -201,9 +201,7 @@ export class ServerService {
this.configReset = true
// Notify config update
- this.getConfig().subscribe(() => {
- // empty, to fire a reset config event
- })
+ return this.getConfig()
}
getConfig () {
@@ -212,7 +210,6 @@ export class ServerService {
if (!this.configObservable) {
this.configObservable = this.http.get(ServerService.BASE_CONFIG_URL)
.pipe(
- tap(config => this.saveConfigLocally(config)),
tap(config => {
this.config = config
this.configLoaded = true
@@ -343,20 +340,15 @@ export class ServerService {
)
}
- private saveConfigLocally (config: ServerConfig) {
- peertubeLocalStorage.setItem(ServerService.CONFIG_LOCAL_STORAGE_KEY, JSON.stringify(config))
- }
-
private loadConfigLocally () {
- const configString = peertubeLocalStorage.getItem(ServerService.CONFIG_LOCAL_STORAGE_KEY)
+ const configString = window['PeerTubeServerConfig']
+ if (!configString) return
- if (configString) {
- try {
- const parsed = JSON.parse(configString)
- Object.assign(this.config, parsed)
- } catch (err) {
- console.error('Cannot parse config saved in local storage.', err)
- }
+ try {
+ const parsed = JSON.parse(configString)
+ Object.assign(this.config, parsed)
+ } catch (err) {
+ console.error('Cannot parse config saved in from index.html.', err)
}
}
}
diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts
index 4c4611d01..e7a5ae17a 100644
--- a/client/src/app/core/theme/theme.service.ts
+++ b/client/src/app/core/theme/theme.service.ts
@@ -82,7 +82,19 @@ export class ThemeService {
: this.userService.getAnonymousUser().theme
if (theme !== 'instance-default') return theme
- return this.serverConfig.theme.default
+
+ const instanceTheme = this.serverConfig.theme.default
+ if (instanceTheme !== 'default') return instanceTheme
+
+ // Default to dark theme if available and wanted by the user
+ if (
+ this.themes.find(t => t.name === 'dark') &&
+ window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
+ ) {
+ return 'dark'
+ }
+
+ return instanceTheme
}
private loadTheme (name: string) {
diff --git a/client/src/app/helpers/utils.ts b/client/src/app/helpers/utils.ts
index a1747af3c..94f6def26 100644
--- a/client/src/app/helpers/utils.ts
+++ b/client/src/app/helpers/utils.ts
@@ -1,4 +1,4 @@
-import { map } from 'rxjs/operators'
+import { first, map } from 'rxjs/operators'
import { SelectChannelItem } from 'src/types/select-options-item.model'
import { DatePipe } from '@angular/common'
import { HttpErrorResponse } from '@angular/common/http'
@@ -23,20 +23,29 @@ function getParameterByName (name: string, url: string) {
function listUserChannels (authService: AuthService) {
return authService.userInformationLoaded
- .pipe(map(() => {
- const user = authService.getUser()
- if (!user) return undefined
+ .pipe(
+ first(),
+ map(() => {
+ const user = authService.getUser()
+ if (!user) return undefined
- const videoChannels = user.videoChannels
- if (Array.isArray(videoChannels) === false) return undefined
+ const videoChannels = user.videoChannels
+ if (Array.isArray(videoChannels) === false) return undefined
- return videoChannels.map(c => ({
- id: c.id,
- label: c.displayName,
- support: c.support,
- avatarPath: c.avatar?.path
- }) as SelectChannelItem)
- }))
+ return videoChannels
+ .sort((a, b) => {
+ if (a.updatedAt < b.updatedAt) return 1
+ if (a.updatedAt > b.updatedAt) return -1
+ return 0
+ })
+ .map(c => ({
+ id: c.id,
+ label: c.displayName,
+ support: c.support,
+ avatarPath: c.avatar?.path
+ }) as SelectChannelItem)
+ })
+ )
}
function getAbsoluteAPIUrl () {
@@ -167,8 +176,8 @@ function isXPercentInViewport (el: HTMLElement, percentVisible: number) {
)
}
-function uploadErrorHandler (parameters: {
- err: HttpErrorResponse
+function genericUploadErrorHandler (parameters: {
+ err: Pick
name: string
notifier: Notifier
sticky?: boolean
@@ -180,6 +189,9 @@ function uploadErrorHandler (parameters: {
if (err instanceof ErrorEvent) { // network error
message = $localize`The connection was interrupted`
notifier.error(message, title, null, sticky)
+ } else if (err.status === HttpStatusCode.INTERNAL_SERVER_ERROR_500) {
+ message = $localize`The server encountered an error`
+ notifier.error(message, title, null, sticky)
} else if (err.status === HttpStatusCode.REQUEST_TIMEOUT_408) {
message = $localize`Your ${name} file couldn't be transferred before the set timeout (usually 10min)`
notifier.error(message, title, null, sticky)
@@ -210,5 +222,5 @@ export {
isInViewport,
isXPercentInViewport,
listUserChannels,
- uploadErrorHandler
+ genericUploadErrorHandler
}
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 3a7ffcbb6..2c2c4f260 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -123,24 +123,9 @@
ON {{instanceName}}
-
-
-
-
-
-
-
[] = []
private serverConfig: ServerConfig
private routesPerRight: { [role in UserRight]?: string } = {
@@ -80,7 +92,10 @@ export class MenuComponent implements OnInit {
ngOnInit () {
this.serverConfig = this.serverService.getTmpConfig()
this.serverService.getConfig()
- .subscribe(config => this.serverConfig = config)
+ .subscribe(config => {
+ this.serverConfig = config
+ this.buildMenuLinks()
+ })
this.isLoggedIn = this.authService.isLoggedIn()
if (this.isLoggedIn === true) {
@@ -241,6 +256,10 @@ export class MenuComponent implements OnInit {
}
}
+ private buildMenuLinks () {
+ this.commonMenuLinks = this.menuService.buildCommonLinks(this.serverConfig)
+ }
+
private buildUserLanguages () {
if (!this.user) {
this.videoLanguages = []
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
index 8c12d3c4c..08372d8ad 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
@@ -42,7 +42,7 @@ export class ActorBannerEditComponent implements OnInit {
this.bannerExtensions = config.banner.file.extensions.join(', ')
// tslint:disable:max-line-length
- this.bannerFormat = $localize`ratio 6/1, recommended size: 1600x266, max size: ${getBytes(this.maxBannerSize)}, extensions: ${this.bannerExtensions}`
+ this.bannerFormat = $localize`ratio 6/1, recommended size: 1920x317, max size: ${getBytes(this.maxBannerSize)}, extensions: ${this.bannerExtensions}`
})
}
diff --git a/client/src/app/shared/shared-custom-markup/channel-miniature-markup.component.html b/client/src/app/shared/shared-custom-markup/channel-miniature-markup.component.html
new file mode 100644
index 000000000..da81006b9
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/channel-miniature-markup.component.html
@@ -0,0 +1,8 @@
+
+
+
+
{{ channel.displayName }}
+
{{ channel.name }}
+
+
{{ channel.description }}
+
+
+@Injectable()
+export class CustomMarkupService {
+ private builders: { [ selector: string ]: BuilderFunction } = {
+ 'peertube-video-embed': el => this.embedBuilder(el, 'video'),
+ 'peertube-playlist-embed': el => this.embedBuilder(el, 'playlist'),
+ 'peertube-video-miniature': el => this.videoMiniatureBuilder(el),
+ 'peertube-playlist-miniature': el => this.playlistMiniatureBuilder(el),
+ 'peertube-channel-miniature': el => this.channelMiniatureBuilder(el),
+ 'peertube-videos-list': el => this.videosListBuilder(el)
+ }
+
+ constructor (
+ private dynamicElementService: DynamicElementService,
+ private markdown: MarkdownService
+ ) { }
+
+ async buildElement (text: string) {
+ const html = await this.markdown.customPageMarkdownToHTML(text, this.getSupportedTags())
+
+ const rootElement = document.createElement('div')
+ rootElement.innerHTML = html
+
+ for (const selector of this.getSupportedTags()) {
+ rootElement.querySelectorAll(selector)
+ .forEach((e: HTMLElement) => {
+ try {
+ const component = this.execBuilder(selector, e)
+
+ this.dynamicElementService.injectElement(e, component)
+ } catch (err) {
+ console.error('Cannot inject component %s.', selector, err)
+ }
+ })
+ }
+
+ return rootElement
+ }
+
+ private getSupportedTags () {
+ return Object.keys(this.builders)
+ }
+
+ private execBuilder (selector: string, el: HTMLElement) {
+ return this.builders[selector](el)
+ }
+
+ private embedBuilder (el: HTMLElement, type: 'video' | 'playlist') {
+ const data = el.dataset as EmbedMarkupData
+ const component = this.dynamicElementService.createElement(EmbedMarkupComponent)
+
+ this.dynamicElementService.setModel(component, { uuid: data.uuid, type })
+
+ return component
+ }
+
+ private videoMiniatureBuilder (el: HTMLElement) {
+ const data = el.dataset as VideoMiniatureMarkupData
+ const component = this.dynamicElementService.createElement(VideoMiniatureMarkupComponent)
+
+ this.dynamicElementService.setModel(component, { uuid: data.uuid })
+
+ return component
+ }
+
+ private playlistMiniatureBuilder (el: HTMLElement) {
+ const data = el.dataset as PlaylistMiniatureMarkupData
+ const component = this.dynamicElementService.createElement(PlaylistMiniatureMarkupComponent)
+
+ this.dynamicElementService.setModel(component, { uuid: data.uuid })
+
+ return component
+ }
+
+ private channelMiniatureBuilder (el: HTMLElement) {
+ const data = el.dataset as ChannelMiniatureMarkupData
+ const component = this.dynamicElementService.createElement(ChannelMiniatureMarkupComponent)
+
+ this.dynamicElementService.setModel(component, { name: data.name })
+
+ return component
+ }
+
+ private videosListBuilder (el: HTMLElement) {
+ const data = el.dataset as VideosListMarkupData
+ const component = this.dynamicElementService.createElement(VideosListMarkupComponent)
+
+ const model = {
+ title: data.title,
+ description: data.description,
+ sort: data.sort,
+ categoryOneOf: this.buildArrayNumber(data.categoryOneOf),
+ languageOneOf: this.buildArrayString(data.languageOneOf),
+ count: this.buildNumber(data.count) || 10
+ }
+
+ this.dynamicElementService.setModel(component, model)
+
+ return component
+ }
+
+ private buildNumber (value: string) {
+ if (!value) return undefined
+
+ return parseInt(value, 10)
+ }
+
+ private buildArrayNumber (value: string) {
+ if (!value) return undefined
+
+ return value.split(',').map(v => parseInt(v, 10))
+ }
+
+ private buildArrayString (value: string) {
+ if (!value) return undefined
+
+ return value.split(',')
+ }
+}
diff --git a/client/src/app/shared/shared-custom-markup/dynamic-element.service.ts b/client/src/app/shared/shared-custom-markup/dynamic-element.service.ts
new file mode 100644
index 000000000..e967e30ac
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/dynamic-element.service.ts
@@ -0,0 +1,57 @@
+import {
+ ApplicationRef,
+ ComponentFactoryResolver,
+ ComponentRef,
+ EmbeddedViewRef,
+ Injectable,
+ Injector,
+ OnChanges,
+ SimpleChange,
+ SimpleChanges,
+ Type
+} from '@angular/core'
+
+@Injectable()
+export class DynamicElementService {
+
+ constructor (
+ private injector: Injector,
+ private applicationRef: ApplicationRef,
+ private componentFactoryResolver: ComponentFactoryResolver
+ ) { }
+
+ createElement (ofComponent: Type) {
+ const div = document.createElement('div')
+
+ const component = this.componentFactoryResolver.resolveComponentFactory(ofComponent)
+ .create(this.injector, [], div)
+
+ return component
+ }
+
+ injectElement (wrapper: HTMLElement, componentRef: ComponentRef) {
+ const hostView = componentRef.hostView as EmbeddedViewRef
+
+ this.applicationRef.attachView(hostView)
+ wrapper.appendChild(hostView.rootNodes[0])
+ }
+
+ setModel (componentRef: ComponentRef, attributes: Partial) {
+ const changes: SimpleChanges = {}
+
+ for (const key of Object.keys(attributes)) {
+ const previousValue = componentRef.instance[key]
+ const newValue = attributes[key]
+
+ componentRef.instance[key] = newValue
+ changes[key] = new SimpleChange(previousValue, newValue, previousValue === undefined)
+ }
+
+ const component = componentRef.instance
+ if (typeof (component as unknown as OnChanges).ngOnChanges === 'function') {
+ (component as unknown as OnChanges).ngOnChanges(changes)
+ }
+
+ componentRef.changeDetectorRef.detectChanges()
+ }
+}
diff --git a/client/src/app/shared/shared-custom-markup/embed-markup.component.ts b/client/src/app/shared/shared-custom-markup/embed-markup.component.ts
new file mode 100644
index 000000000..a854d89f6
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/embed-markup.component.ts
@@ -0,0 +1,22 @@
+import { buildPlaylistLink, buildVideoLink, buildVideoOrPlaylistEmbed } from 'src/assets/player/utils'
+import { environment } from 'src/environments/environment'
+import { Component, ElementRef, Input, OnInit } from '@angular/core'
+
+@Component({
+ selector: 'my-embed-markup',
+ template: ''
+})
+export class EmbedMarkupComponent implements OnInit {
+ @Input() uuid: string
+ @Input() type: 'video' | 'playlist' = 'video'
+
+ constructor (private el: ElementRef) { }
+
+ ngOnInit () {
+ const link = this.type === 'video'
+ ? buildVideoLink({ baseUrl: `${environment.originServerUrl}/videos/embed/${this.uuid}` })
+ : buildPlaylistLink({ baseUrl: `${environment.originServerUrl}/video-playlists/embed/${this.uuid}` })
+
+ this.el.nativeElement.innerHTML = buildVideoOrPlaylistEmbed(link, this.uuid)
+ }
+}
diff --git a/client/src/app/shared/shared-custom-markup/index.ts b/client/src/app/shared/shared-custom-markup/index.ts
new file mode 100644
index 000000000..14bde3ea9
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/index.ts
@@ -0,0 +1,3 @@
+export * from './custom-markup.service'
+export * from './dynamic-element.service'
+export * from './shared-custom-markup.module'
diff --git a/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.html b/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.html
new file mode 100644
index 000000000..4e1d1a13f
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.html
@@ -0,0 +1,2 @@
+
+
diff --git a/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.scss b/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.scss
new file mode 100644
index 000000000..281cef726
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.scss
@@ -0,0 +1,7 @@
+@import '_variables';
+@import '_mixins';
+
+my-video-playlist-miniature {
+ display: inline-block;
+ width: $video-thumbnail-width;
+}
diff --git a/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.ts
new file mode 100644
index 000000000..7aee450f1
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/playlist-miniature-markup.component.ts
@@ -0,0 +1,38 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { MiniatureDisplayOptions } from '../shared-video-miniature'
+import { VideoPlaylist, VideoPlaylistService } from '../shared-video-playlist'
+
+/*
+ * Markup component that creates a playlist miniature only
+*/
+
+@Component({
+ selector: 'my-playlist-miniature-markup',
+ templateUrl: 'playlist-miniature-markup.component.html',
+ styleUrls: [ 'playlist-miniature-markup.component.scss' ]
+})
+export class PlaylistMiniatureMarkupComponent implements OnInit {
+ @Input() uuid: string
+
+ playlist: VideoPlaylist
+
+ displayOptions: MiniatureDisplayOptions = {
+ date: true,
+ views: true,
+ by: true,
+ avatar: false,
+ privacyLabel: false,
+ privacyText: false,
+ state: false,
+ blacklistInfo: false
+ }
+
+ constructor (
+ private playlistService: VideoPlaylistService
+ ) { }
+
+ ngOnInit () {
+ this.playlistService.getVideoPlaylist(this.uuid)
+ .subscribe(playlist => this.playlist = playlist)
+ }
+}
diff --git a/client/src/app/shared/shared-custom-markup/shared-custom-markup.module.ts b/client/src/app/shared/shared-custom-markup/shared-custom-markup.module.ts
new file mode 100644
index 000000000..4bbb71588
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/shared-custom-markup.module.ts
@@ -0,0 +1,49 @@
+
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { SharedActorImageModule } from '../shared-actor-image/shared-actor-image.module'
+import { SharedGlobalIconModule } from '../shared-icons'
+import { SharedMainModule } from '../shared-main'
+import { SharedVideoMiniatureModule } from '../shared-video-miniature'
+import { SharedVideoPlaylistModule } from '../shared-video-playlist'
+import { ChannelMiniatureMarkupComponent } from './channel-miniature-markup.component'
+import { CustomMarkupService } from './custom-markup.service'
+import { DynamicElementService } from './dynamic-element.service'
+import { EmbedMarkupComponent } from './embed-markup.component'
+import { PlaylistMiniatureMarkupComponent } from './playlist-miniature-markup.component'
+import { VideoMiniatureMarkupComponent } from './video-miniature-markup.component'
+import { VideosListMarkupComponent } from './videos-list-markup.component'
+
+@NgModule({
+ imports: [
+ CommonModule,
+
+ SharedMainModule,
+ SharedGlobalIconModule,
+ SharedVideoMiniatureModule,
+ SharedVideoPlaylistModule,
+ SharedActorImageModule
+ ],
+
+ declarations: [
+ VideoMiniatureMarkupComponent,
+ PlaylistMiniatureMarkupComponent,
+ ChannelMiniatureMarkupComponent,
+ EmbedMarkupComponent,
+ VideosListMarkupComponent
+ ],
+
+ exports: [
+ VideoMiniatureMarkupComponent,
+ PlaylistMiniatureMarkupComponent,
+ ChannelMiniatureMarkupComponent,
+ VideosListMarkupComponent,
+ EmbedMarkupComponent
+ ],
+
+ providers: [
+ CustomMarkupService,
+ DynamicElementService
+ ]
+})
+export class SharedCustomMarkupModule { }
diff --git a/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.html b/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.html
new file mode 100644
index 000000000..9b4930b6d
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.html
@@ -0,0 +1,6 @@
+
+
diff --git a/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.scss b/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.scss
new file mode 100644
index 000000000..81e265f29
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.scss
@@ -0,0 +1,7 @@
+@import '_variables';
+@import '_mixins';
+
+my-video-miniature {
+ display: inline-block;
+ width: $video-thumbnail-width;
+}
diff --git a/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.ts
new file mode 100644
index 000000000..79add0c3b
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/video-miniature-markup.component.ts
@@ -0,0 +1,44 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { AuthService } from '@app/core'
+import { Video, VideoService } from '../shared-main'
+import { MiniatureDisplayOptions } from '../shared-video-miniature'
+
+/*
+ * Markup component that creates a video miniature only
+*/
+
+@Component({
+ selector: 'my-video-miniature-markup',
+ templateUrl: 'video-miniature-markup.component.html',
+ styleUrls: [ 'video-miniature-markup.component.scss' ]
+})
+export class VideoMiniatureMarkupComponent implements OnInit {
+ @Input() uuid: string
+
+ video: Video
+
+ displayOptions: MiniatureDisplayOptions = {
+ date: true,
+ views: true,
+ by: true,
+ avatar: false,
+ privacyLabel: false,
+ privacyText: false,
+ state: false,
+ blacklistInfo: false
+ }
+
+ constructor (
+ private auth: AuthService,
+ private videoService: VideoService
+ ) { }
+
+ getUser () {
+ return this.auth.getUser()
+ }
+
+ ngOnInit () {
+ this.videoService.getVideo({ videoId: this.uuid })
+ .subscribe(video => this.video = video)
+ }
+}
diff --git a/client/src/app/shared/shared-custom-markup/videos-list-markup.component.html b/client/src/app/shared/shared-custom-markup/videos-list-markup.component.html
new file mode 100644
index 000000000..501f35e04
--- /dev/null
+++ b/client/src/app/shared/shared-custom-markup/videos-list-markup.component.html
@@ -0,0 +1,13 @@
+
+
{{ title }}
+
{{ description }}
+
+
+
+
+
+
Complete preview
+
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.ts b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
index 9b3ab9cf3..a233a4205 100644
--- a/client/src/app/shared/shared-forms/markdown-textarea.component.ts
+++ b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
@@ -1,9 +1,10 @@
-import { ViewportScroller } from '@angular/common'
import truncate from 'lodash-es/truncate'
import { Subject } from 'rxjs'
import { debounceTime, distinctUntilChanged } from 'rxjs/operators'
+import { ViewportScroller } from '@angular/common'
import { Component, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core'
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
+import { SafeHtml } from '@angular/platform-browser'
import { MarkdownService, ScreenService } from '@app/core'
@Component({
@@ -21,18 +22,27 @@ import { MarkdownService, ScreenService } from '@app/core'
export class MarkdownTextareaComponent implements ControlValueAccessor, OnInit {
@Input() content = ''
+
@Input() classes: string[] | { [klass: string]: any[] | any } = []
+
@Input() textareaMaxWidth = '100%'
@Input() textareaHeight = '150px'
+
@Input() truncate: number
+
@Input() markdownType: 'text' | 'enhanced' = 'text'
+ @Input() customMarkdownRenderer?: (text: string) => Promise
+
@Input() markdownVideo = false
+
@Input() name = 'description'
@ViewChild('textarea') textareaElement: ElementRef
+ @ViewChild('previewElement') previewElement: ElementRef
+
+ truncatedPreviewHTML: SafeHtml | string = ''
+ previewHTML: SafeHtml | string = ''
- truncatedPreviewHTML = ''
- previewHTML = ''
isMaximized = false
maximizeInText = $localize`Maximize editor`
@@ -115,10 +125,31 @@ export class MarkdownTextareaComponent implements ControlValueAccessor, OnInit {
}
private async markdownRender (text: string) {
- const html = this.markdownType === 'text' ?
- await this.markdownService.textMarkdownToHTML(text) :
- await this.markdownService.enhancedMarkdownToHTML(text)
+ let html: string
- return this.markdownVideo ? this.markdownService.processVideoTimestamps(html) : html
+ if (this.customMarkdownRenderer) {
+ const result = await this.customMarkdownRenderer(text)
+
+ if (result instanceof HTMLElement) {
+ html = ''
+
+ const wrapperElement = this.previewElement.nativeElement as HTMLElement
+ wrapperElement.innerHTML = ''
+ wrapperElement.appendChild(result)
+ return
+ }
+
+ html = result
+ } else if (this.markdownType === 'text') {
+ html = await this.markdownService.textMarkdownToHTML(text)
+ } else {
+ html = await this.markdownService.enhancedMarkdownToHTML(text)
+ }
+
+ if (this.markdownVideo) {
+ html = this.markdownService.processVideoTimestamps(html)
+ }
+
+ return html
}
}
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index 3af517927..a4dd72db6 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -72,6 +72,7 @@ const icons = {
'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default,
'message-circle': require('!!raw-loader?!../../../assets/images/feather/message-circle.svg').default,
'codesandbox': require('!!raw-loader?!../../../assets/images/feather/codesandbox.svg').default,
+ 'octagon': require('!!raw-loader?!../../../assets/images/feather/octagon.svg').default,
'award': require('!!raw-loader?!../../../assets/images/feather/award.svg').default
}
diff --git a/client/src/app/shared/shared-main/account/account.model.ts b/client/src/app/shared/shared-main/account/account.model.ts
index 6d9f0ee65..7b5611f35 100644
--- a/client/src/app/shared/shared-main/account/account.model.ts
+++ b/client/src/app/shared/shared-main/account/account.model.ts
@@ -4,8 +4,12 @@ import { Actor } from './actor.model'
export class Account extends Actor implements ServerAccount {
displayName: string
description: string
+
+ updatedAt: Date | string
+
nameWithHost: string
nameWithHostForced: string
+
mutedByUser: boolean
mutedByInstance: boolean
mutedServerByUser: boolean
@@ -30,6 +34,8 @@ export class Account extends Actor implements ServerAccount {
this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host)
this.nameWithHostForced = Actor.CREATE_BY_STRING(this.name, this.host, true)
+ if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString())
+
this.mutedByUser = false
this.mutedByInstance = false
this.mutedServerByUser = false
diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts
index 6ba0bb09e..2fccc472a 100644
--- a/client/src/app/shared/shared-main/account/actor.model.ts
+++ b/client/src/app/shared/shared-main/account/actor.model.ts
@@ -12,7 +12,6 @@ export abstract class Actor implements ServerActor {
followersCount: number
createdAt: Date | string
- updatedAt: Date | string
avatar: ActorImage
@@ -55,7 +54,6 @@ export abstract class Actor implements ServerActor {
this.followersCount = hash.followersCount
if (hash.createdAt) this.createdAt = new Date(hash.createdAt.toString())
- if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString())
this.avatar = hash.avatar
this.isLocal = Actor.IS_LOCAL(this.host)
diff --git a/client/src/app/shared/shared-main/angular/from-now.pipe.ts b/client/src/app/shared/shared-main/angular/from-now.pipe.ts
index 5e7832807..d62c1f88e 100644
--- a/client/src/app/shared/shared-main/angular/from-now.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/from-now.pipe.ts
@@ -3,32 +3,37 @@ import { Pipe, PipeTransform } from '@angular/core'
// Thanks: https://stackoverflow.com/questions/3177836/how-to-format-time-since-xxx-e-g-4-minutes-ago-similar-to-stack-exchange-site
@Pipe({ name: 'myFromNow' })
export class FromNowPipe implements PipeTransform {
-
transform (arg: number | Date | string) {
const argDate = new Date(arg)
const seconds = Math.floor((Date.now() - argDate.getTime()) / 1000)
- let interval = Math.round(seconds / 31536000)
+ let interval = Math.floor(seconds / 31536000)
if (interval > 1) return $localize`${interval} years ago`
- if (interval === 1) return $localize`${interval} year ago`
+ if (interval === 1) return $localize`1 year ago`
- interval = Math.round(seconds / 2592000)
+ interval = Math.floor(seconds / 2419200)
+ // 12 months = 360 days, but a year ~ 365 days
+ // Display "1 year ago" rather than "12 months ago"
+ if (interval >= 12) return $localize`1 year ago`
if (interval > 1) return $localize`${interval} months ago`
- if (interval === 1) return $localize`${interval} month ago`
+ if (interval === 1) return $localize`1 month ago`
- interval = Math.round(seconds / 604800)
+ interval = Math.floor(seconds / 604800)
+ // 4 weeks ~ 28 days, but our month is 30 days
+ // Display "1 month ago" rather than "4 weeks ago"
+ if (interval >= 4) return $localize`1 month ago`
if (interval > 1) return $localize`${interval} weeks ago`
- if (interval === 1) return $localize`${interval} week ago`
+ if (interval === 1) return $localize`1 week ago`
- interval = Math.round(seconds / 86400)
+ interval = Math.floor(seconds / 86400)
if (interval > 1) return $localize`${interval} days ago`
- if (interval === 1) return $localize`${interval} day ago`
+ if (interval === 1) return $localize`1 day ago`
- interval = Math.round(seconds / 3600)
+ interval = Math.floor(seconds / 3600)
if (interval > 1) return $localize`${interval} hours ago`
- if (interval === 1) return $localize`${interval} hour ago`
+ if (interval === 1) return $localize`1 hour ago`
- interval = Math.round(seconds / 60)
+ interval = Math.floor(seconds / 60)
if (interval >= 1) return $localize`${interval} min ago`
return $localize`just now`
diff --git a/client/src/app/shared/shared-main/buttons/button.component.scss b/client/src/app/shared/shared-main/buttons/button.component.scss
index 09b5f95d7..22b24c853 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.scss
+++ b/client/src/app/shared/shared-main/buttons/button.component.scss
@@ -30,7 +30,7 @@ span[class$=-button] {
.action-button {
@include peertube-button-link;
- @include button-with-icon(21px, 0, -1px);
+ @include button-with-icon(21px);
}
.orange-button {
diff --git a/client/src/app/shared/shared-main/custom-page/custom-page.service.ts b/client/src/app/shared/shared-main/custom-page/custom-page.service.ts
new file mode 100644
index 000000000..e5c2b3cd4
--- /dev/null
+++ b/client/src/app/shared/shared-main/custom-page/custom-page.service.ts
@@ -0,0 +1,38 @@
+import { of } from 'rxjs'
+import { catchError, map } from 'rxjs/operators'
+import { HttpClient } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import { RestExtractor } from '@app/core'
+import { CustomPage } from '@shared/models'
+import { environment } from '../../../../environments/environment'
+
+@Injectable()
+export class CustomPageService {
+ static BASE_INSTANCE_HOMEPAGE_URL = environment.apiUrl + '/api/v1/custom-pages/homepage/instance'
+
+ constructor (
+ private authHttp: HttpClient,
+ private restExtractor: RestExtractor
+ ) { }
+
+ getInstanceHomepage () {
+ return this.authHttp.get(CustomPageService.BASE_INSTANCE_HOMEPAGE_URL)
+ .pipe(
+ catchError(err => {
+ if (err.status === 404) {
+ return of({ content: '' })
+ }
+
+ this.restExtractor.handleError(err)
+ })
+ )
+ }
+
+ updateInstanceHomepage (content: string) {
+ return this.authHttp.put(CustomPageService.BASE_INSTANCE_HOMEPAGE_URL, { content })
+ .pipe(
+ map(this.restExtractor.extractDataBool),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
+}
diff --git a/client/src/app/shared/shared-main/custom-page/index.ts b/client/src/app/shared/shared-main/custom-page/index.ts
new file mode 100644
index 000000000..7269ece95
--- /dev/null
+++ b/client/src/app/shared/shared-main/custom-page/index.ts
@@ -0,0 +1 @@
+export * from './custom-page.service'
diff --git a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
index 93ba9fb9b..4d5381e8d 100644
--- a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
+++ b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
@@ -3,7 +3,8 @@ import { PluginElementPlaceholder } from '@shared/models'
@Component({
selector: 'my-plugin-placeholder',
- template: '
'
+ template: '
',
+ styles: [ 'div { height: 100%; }' ]
})
export class PluginPlaceholderComponent {
diff --git a/client/src/app/shared/shared-main/shared-main.module.ts b/client/src/app/shared/shared-main/shared-main.module.ts
index 05a5d77c7..f06f25ca5 100644
--- a/client/src/app/shared/shared-main/shared-main.module.ts
+++ b/client/src/app/shared/shared-main/shared-main.module.ts
@@ -29,6 +29,7 @@ import {
} from './angular'
import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
import { ActionDropdownComponent, ButtonComponent, DeleteButtonComponent, EditButtonComponent } from './buttons'
+import { CustomPageService } from './custom-page'
import { DateToggleComponent } from './date'
import { FeedComponent } from './feeds'
import { LoaderComponent, SmallLoaderComponent } from './loaders'
@@ -172,7 +173,9 @@ import { VideoChannelService } from './video-channel'
VideoCaptionService,
- VideoChannelService
+ VideoChannelService,
+
+ CustomPageService
]
})
export class SharedMainModule { }
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
index c40dd5311..a9dcf2fa2 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
@@ -16,6 +16,8 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
banner: ActorImage
bannerUrl: string
+ updatedAt: Date | string
+
ownerAccount?: ServerAccount
ownerBy?: string
@@ -59,6 +61,8 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
this.videosCount = hash.videosCount
+ if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString())
+
if (hash.viewsPerDay) {
this.viewsPerDay = hash.viewsPerDay.map(v => ({ ...v, date: new Date(v.date) }))
}
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
index e65261763..a89f1065a 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
@@ -40,23 +40,24 @@ export class VideoChannelService {
)
}
- listAccountVideoChannels (
- account: Account,
- componentPagination?: ComponentPaginationLight,
- withStats = false,
+ listAccountVideoChannels (options: {
+ account: Account
+ componentPagination?: ComponentPaginationLight
+ withStats?: boolean
+ sort?: string
search?: string
- ): Observable> {
+ }): Observable> {
+ const { account, componentPagination, withStats = false, sort, search } = options
+
const pagination = componentPagination
? this.restService.componentPaginationToRestPagination(componentPagination)
: { start: 0, count: 20 }
let params = new HttpParams()
- params = this.restService.addRestGetParams(params, pagination)
+ params = this.restService.addRestGetParams(params, pagination, sort)
params = params.set('withStats', withStats + '')
- if (search) {
- params = params.set('search', search)
- }
+ if (search) params = params.set('search', search)
const url = AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels'
return this.authHttp.get>(url, { params })
diff --git a/client/src/app/shared/shared-search/advanced-search.model.ts b/client/src/app/shared/shared-search/advanced-search.model.ts
index 0e3924841..2c83f53b6 100644
--- a/client/src/app/shared/shared-search/advanced-search.model.ts
+++ b/client/src/app/shared/shared-search/advanced-search.model.ts
@@ -1,4 +1,4 @@
-import { BooleanBothQuery, SearchTargetType } from '@shared/models'
+import { BooleanBothQuery, BooleanQuery, SearchTargetType, VideosSearchQuery } from '@shared/models'
export class AdvancedSearch {
startDate: string // ISO 8601
@@ -21,6 +21,8 @@ export class AdvancedSearch {
durationMin: number // seconds
durationMax: number // seconds
+ isLive: BooleanQuery
+
sort: string
searchTarget: SearchTargetType
@@ -41,6 +43,8 @@ export class AdvancedSearch {
tagsOneOf?: any
tagsAllOf?: any
+ isLive?: BooleanQuery
+
durationMin?: string
durationMax?: string
sort?: string
@@ -54,6 +58,8 @@ export class AdvancedSearch {
this.originallyPublishedEndDate = options.originallyPublishedEndDate || undefined
this.nsfw = options.nsfw || undefined
+ this.isLive = options.isLive || undefined
+
this.categoryOneOf = options.categoryOneOf || undefined
this.licenceOneOf = options.licenceOneOf || undefined
this.languageOneOf = options.languageOneOf || undefined
@@ -94,6 +100,7 @@ export class AdvancedSearch {
this.tagsAllOf = undefined
this.durationMin = undefined
this.durationMax = undefined
+ this.isLive = undefined
this.sort = '-match'
}
@@ -112,12 +119,16 @@ export class AdvancedSearch {
tagsAllOf: this.tagsAllOf,
durationMin: this.durationMin,
durationMax: this.durationMax,
+ isLive: this.isLive,
sort: this.sort,
searchTarget: this.searchTarget
}
}
- toAPIObject () {
+ toAPIObject (): VideosSearchQuery {
+ let isLive: boolean
+ if (this.isLive) isLive = this.isLive === 'true'
+
return {
startDate: this.startDate,
endDate: this.endDate,
@@ -131,6 +142,7 @@ export class AdvancedSearch {
tagsAllOf: this.tagsAllOf,
durationMin: this.durationMin,
durationMax: this.durationMax,
+ isLive,
sort: this.sort,
searchTarget: this.searchTarget
}
diff --git a/client/src/app/shared/shared-user-subscription/subscribe-button.component.html b/client/src/app/shared/shared-user-subscription/subscribe-button.component.html
index 75cfc918b..d8699ff69 100644
--- a/client/src/app/shared/shared-user-subscription/subscribe-button.component.html
+++ b/client/src/app/shared/shared-user-subscription/subscribe-button.component.html
@@ -40,7 +40,7 @@
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
index 5df89d019..0bbdff1e6 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss
@@ -95,6 +95,7 @@ my-actor-avatar {
.video-bottom {
display: flex;
width: 100%;
+ min-width: 1px;
}
.video-miniature-name {
@@ -145,6 +146,7 @@ my-actor-avatar {
.video-bottom {
display: flex;
+ min-width: 1px;
}
// We don't display avatar in row mode
diff --git a/client/src/assets/images/feather/octagon.svg b/client/src/assets/images/feather/octagon.svg
new file mode 100644
index 000000000..1ed9bacbf
--- /dev/null
+++ b/client/src/assets/images/feather/octagon.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/client/src/assets/player/stats/stats-card.ts b/client/src/assets/player/stats/stats-card.ts
index d9f0d2fe9..a93f59506 100644
--- a/client/src/assets/player/stats/stats-card.ts
+++ b/client/src/assets/player/stats/stats-card.ts
@@ -89,9 +89,9 @@ class StatsCard extends Component {
this.container.style.display = 'block'
this.updateInterval = setInterval(async () => {
try {
- const options = this.mode === 'webtorrent'
- ? await this.buildWebTorrentOptions()
- : await this.buildHLSOptions()
+ const options = this.mode === 'p2p-media-loader'
+ ? await this.buildHLSOptions()
+ : await this.buildWebTorrentOptions() // Default
this.list.innerHTML = this.getListTemplate(options)
} catch (err) {
@@ -212,7 +212,7 @@ class StatsCard extends Component {
: undefined
return `
- ${this.buildElement(player.localize('Player mode'), this.options_.mode)}
+ ${this.buildElement(player.localize('Player mode'), this.mode || 'HTTP')}
${this.buildElement(player.localize('Video UUID'), this.options_.videoUUID)}
diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index d7451fa1d..1243526d2 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -95,7 +95,7 @@ function buildVideoLink (options: {
function buildPlaylistLink (options: {
baseUrl?: string
- playlistPosition: number
+ playlistPosition?: number
}) {
const { baseUrl } = options
diff --git a/client/src/assets/player/webtorrent/webtorrent-plugin.ts b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
index 6f5fbe4c9..e27a16390 100644
--- a/client/src/assets/player/webtorrent/webtorrent-plugin.ts
+++ b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
@@ -557,7 +557,8 @@ class WebTorrentPlugin extends Plugin {
private pickAverageVideoFile () {
if (this.videoFiles.length === 1) return this.videoFiles[0]
- return this.videoFiles[Math.floor(this.videoFiles.length / 2)]
+ const files = this.videoFiles.filter(f => f.resolution.id !== 0)
+ return files[Math.floor(files.length / 2)]
}
private stopTorrent (torrent: WebTorrent.Torrent) {
diff --git a/client/src/index.html b/client/src/index.html
index 72c184dc1..28667cdd0 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -29,6 +29,7 @@
+
diff --git a/client/src/locale/angular.ar.xlf b/client/src/locale/angular.ar.xlf
index 906b00dd9..19e27dba6 100644
--- a/client/src/locale/angular.ar.xlf
+++ b/client/src/locale/angular.ar.xlf
@@ -20,7 +20,7 @@
-
+
سجل مشاهداتي
src/app/+my-library/my-history/my-history.component.ts 67
-
+
Delete
احذف
@@ -44,120 +44,120 @@
53
-
+
Edit
حرر
- src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 85 src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 11 src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 85 src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 11 src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html 11 src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html 11 src/app/+videos/+video-edit/video-add-components/video-upload.component.html 38 src/app/+videos/+video-edit/shared/video-edit.component.html 270 src/app/+admin/users/user-edit/user-edit.component.html 11 src/app/+admin/users/user-edit/user-edit.component.html 11
+
+
+
+
+
+
+
+
+
+
+ src/app/+admin/users/user-edit/user-edit.component.html 11 src/app/+admin/users/user-edit/user-edit.component.html 11 src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html 11 src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html 11 src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 11 src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 11 src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 85 src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html 85 src/app/+videos/+video-edit/shared/video-edit.component.html 270 src/app/+videos/+video-edit/video-add-components/video-upload.component.html 43
<a href="https://en.wikipedia.org/wiki/Markdown#Example" target="_blank" rel="noopener noreferrer">Markdown</a> compatible that supports:
<a href="https://en.wikipedia.org/wiki/Markdown#Example" target="_blank" rel="noopener noreferrer">تكامل ماركداون</a> المدعوم:
src/app/shared/shared-main/misc/help.component.ts 75
-
+
You don't have notifications.
ليس لديك إشعارات.
src/app/shared/shared-main/users/user-notifications.component.html 1
-
+
نشر
src/app/shared/shared-main/users/user-notifications.component.html 15
-
+
The notification concerns a video now unavailable
الإشعار يتعلق بفيديو غير متوفر الآن
src/app/shared/shared-main/users/user-notifications.component.html 24
-
+
Your video
الفيديو الخاص بك
src/app/shared/shared-main/users/user-notifications.component.html 33
-
+
Your video
الفيديو الخاص بك
src/app/shared/shared-main/users/user-notifications.component.html 41
-
+
src/app/shared/shared-main/users/user-notifications.component.html 49
-
+
src/app/shared/shared-main/users/user-notifications.component.html 53
-
+
src/app/shared/shared-main/users/user-notifications.component.html 57
-
+
src/app/shared/shared-main/users/user-notifications.component.html 62
-
+
src/app/shared/shared-main/users/user-notifications.component.html 70
-
+
رسالة جديدة حول
src/app/shared/shared-main/users/user-notifications.component.html 80
-
+
The recently added video
الفيديو المضاف مؤخرا
src/app/shared/shared-main/users/user-notifications.component.html 88
-
+
علق
src/app/shared/shared-main/users/user-notifications.component.html 99
-
+
The notification concerns a comment now unavailable
الإشعار يتعلق بتعليق غير متوفر الآن
src/app/shared/shared-main/users/user-notifications.component.html 107 src/app/shared/shared-main/users/user-notifications.component.html 172
-
+
Your video
نُشر الفيديو الخاص بك
src/app/shared/shared-main/users/user-notifications.component.html 116
-
+
src/app/shared/shared-main/users/user-notifications.component.html 124
-
+
src/app/shared/shared-main/users/user-notifications.component.html 132
-
+
User
سجَل المستخدم
src/app/shared/shared-main/users/user-notifications.component.html 140
-
+
src/app/shared/shared-main/users/user-notifications.component.html 150
+ src/app/shared/shared-main/users/user-notifications.component.html 150
src/app/shared/shared-main/users/user-notifications.component.html
@@ -165,55 +165,55 @@
-
+
Your instance has
لدى مثيل الخادم الخاص بك
src/app/shared/shared-main/users/user-notifications.component.html 181
-
+
Your instance automatically followed
قام مثيل الخادم الخاص بك بالتتبع التقائي لـ
- src/app/shared/shared-main/users/user-notifications.component.html 190
+ src/app/shared/shared-main/users/user-notifications.component.html 190
src/app/shared/shared-main/users/user-notifications.component.html
198,199
-
+
src/app/shared/shared-main/users/user-notifications.component.html
206,207
-
+
The notification points to content now unavailable
يشير الإشعار إلى محتوى غير متوفر الآن
src/app/shared/shared-main/users/user-notifications.component.html 214
-
+
Change your avatar
غيّر صورتك الرمزية
src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html 18
-
+
Remove avatar
احذف صورتك الرمزية
src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html 40
-
+
src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html 27
-
+
Upload a new avatar
ارفع صورة رمزية جديدة
src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html 9 src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html 34
-
+
Truncated preview
معاينة مقتطعة
src/app/shared/shared-forms/markdown-textarea.component.html 11 اعرض
src/app/shared/shared-forms/input-toggle-hidden.component.ts 39
-
+
Complete preview
معاينة كاملة
src/app/shared/shared-forms/markdown-textarea.component.html 19
-
+
Recommended
مقترح
src/app/shared/shared-forms/peertube-checkbox.component.html 33
-
+
Theme
السمة
src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html 14 src/app/shared/shared-user-settings/user-interface-settings.component.html 4
-
+
instance default
مثيل الخادم الإفتراضي
src/app/shared/shared-user-settings/user-interface-settings.component.html 8
-
+
peertube default
افتراضي بيرتيوب
src/app/shared/shared-user-settings/user-interface-settings.component.html 9
-
+
Save
احفظ
src/app/shared/shared-user-settings/user-interface-settings.component.html 16 src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html 82 src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html 38
-
+
Default policy on videos containing sensitive content
السياسة الفيديوهات ذات المحتوى الحساس
src/app/shared/shared-user-settings/user-video-settings.component.html 4
+
With With
src/app/shared/shared-user-settings/user-video-settings.component.html
@@ -276,251 +276,251 @@
-
+
Policy for sensitive videos
سياسة الفيديوهات الحساسة
src/app/+admin/config/edit-custom-config/edit-instance-information.component.html 114 src/app/shared/shared-user-settings/user-video-settings.component.html 15
-
+
Blur thumbnails
صور مصغرة مطموسة
src/app/+admin/config/edit-custom-config/edit-instance-information.component.html 116 src/app/shared/shared-user-settings/user-video-settings.component.html 17
-
+
Display
أظهرها
src/app/+admin/config/edit-custom-config/edit-instance-information.component.html 117 src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html 8 src/app/shared/shared-user-settings/user-video-settings.component.html 18
-
+
Only display videos in the following languages/subtitles
عرض مقاطع الفيديو باللغات / الترجمات التالية فقط
src/app/shared/shared-user-settings/user-video-settings.component.html 25
-
+
In Recently added, Trending, Local, Most liked and Search pages
في صفحات: المضافة حديثًا ، الشائعة ، المحلية ، الأكثر إعجابًا البحث
src/app/shared/shared-user-settings/user-video-settings.component.html 28
-
+
Add a new language
أضف لغة جديدة
src/app/+admin/config/edit-custom-config/edit-instance-information.component.html 67 src/app/shared/shared-user-settings/user-video-settings.component.html 36
-
+
The
يشير
src/app/shared/shared-user-settings/user-video-settings.component.html 50
-
+
Help share videos being played
المساهمة في نشر الفيديوهات
src/app/shared/shared-user-settings/user-video-settings.component.html 47
-
+
When on a video page, directly start playing the video.
عندما تكون في صفحة فيديو ، شغِل الفيديو.
src/app/shared/shared-user-settings/user-video-settings.component.html 61
-
+
Automatically play videos
شغّل الفيديوهات تلقائيا
src/app/shared/shared-user-settings/user-video-settings.component.html 58
-
+
When a video ends, follow up with the next suggested video.
عندما ينتهي الفيديو ، شغّل الفيديو المقترح التالي.
src/app/shared/shared-user-settings/user-video-settings.component.html 72
-
+
Automatically start playing the next video
شغّل الفيديو التالي تلقائيا
src/app/shared/shared-user-settings/user-video-settings.component.html 69
-
+
yes
نعم
src/app/shared/shared-instance/feature-boolean.component.html 1 src/app/shared/shared-instance/feature-boolean.component.html 1
-
+
no
لا
src/app/shared/shared-instance/feature-boolean.component.html 2 src/app/shared/shared-instance/feature-boolean.component.html 2
-
+
Features found on this instance
مميزات مثيل الخادم
src/app/shared/shared-instance/instance-features-table.component.html 4 src/app/shared/shared-instance/instance-about-accordion.component.html 6 src/app/shared/shared-instance/instance-about-accordion.component.html 6
-
+
PeerTube version
إصدار بيرتيوب
src/app/shared/shared-instance/instance-features-table.component.html 6
-
+
src/app/shared/shared-instance/instance-features-table.component.html 13
-
+
User registration allowed
التسجيل مسموح
src/app/shared/shared-instance/instance-features-table.component.html 21
-
+
Video uploads
رفع فيديو
src/app/shared/shared-instance/instance-features-table.component.html 28 src/app/shared/shared-instance/instance-features-table.component.html 39
-
+
Transcoding in multiple resolutions
تحويل الترميز لإنشاء عدة دِقات
src/app/shared/shared-instance/instance-features-table.component.html 32
-
+
Live streaming enabled
البث المباشر مفعل
src/app/shared/shared-instance/instance-features-table.component.html 71
-
+
Transcode live video in multiple resolutions
تحويل ترميز فيديو البث المباشر لإنشاء عدة دِقات
src/app/shared/shared-instance/instance-features-table.component.html 78
-
+
Max parallel lives
أقصى عدد للبثوث المباشرة
src/app/shared/shared-instance/instance-features-table.component.html 85
-
+
src/app/shared/shared-instance/instance-features-table.component.html 86
-
+
Requires manual validation by moderators
يتطلب تأكيدًا يدويًا من قبل المشرفين
src/app/shared/shared-instance/instance-features-table.component.html 41
-
+
Automatically published
نُشر تلقائيًا
src/app/shared/shared-instance/instance-features-table.component.html 42
-
+
Video quota
حصة الفيديو
src/app/shared/shared-instance/instance-features-table.component.html 47 src/app/+admin/users/user-edit/user-edit.component.html 151 src/app/+admin/users/user-edit/user-edit.component.html 151
-
+
Unlimited
غير محدود
src/app/shared/shared-instance/instance-features-table.component.html 61
-
+
Import
استورد
src/app/shared/shared-instance/instance-features-table.component.html 92 src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html 44 src/app/+videos/+video-edit/video-add-components/video-import-url.component.html 36
-
+
You can import any torrent file that points to a media file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance.
يمكنك استيراد أي ملف تورنت يشير لملف وسائط ، تأكد من أنك تمتلك حقوق توزيع هذا الملف وإلا ستسبب لنفسك ولمثيل الخادم مشاكل قانونية.
src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html 20
-
+
HTTP import (YouTube, Vimeo, direct URL...)
استيراد عبرHTTP (YouTube ، Vimeo ،رابط مباشر ...)
src/app/shared/shared-instance/instance-features-table.component.html 96
-
+
Torrent import
استيراد تورنت
src/app/shared/shared-instance/instance-features-table.component.html 103
-
+
Player
المشغل
src/app/shared/shared-instance/instance-features-table.component.html 111
-
+
P2P enabled
تم تمكين الند لند
src/app/shared/shared-instance/instance-features-table.component.html 115
-
+
Search
ابحث
src/app/header/search-typeahead.component.html 8 src/app/shared/shared-instance/instance-features-table.component.html 122 src/app/+admin/plugins/plugins.component.html 5
-
+
Users can resolve distant content
يمكن للمستخدمين من تحليل المحتوى البعيد
src/app/shared/shared-instance/instance-features-table.component.html 126
-
+
Loading instance statistics...
يحمل إحصائيات مثيل الخادم ...
src/app/shared/shared-instance/instance-statistics.component.html 1
-
+
Local
المحلية
src/app/shared/shared-instance/instance-statistics.component.html 4
-
+
users
مستخدمون
src/app/shared/shared-instance/instance-statistics.component.html 11
-
+
videos
فيديوهات
src/app/shared/shared-instance/instance-statistics.component.html 21 src/app/shared/shared-instance/instance-statistics.component.html 65
-
+
video views
مرات مشاهدة الفيديو
src/app/shared/shared-instance/instance-statistics.component.html 31
-
+
video comments
تعليقات الفيديو
src/app/shared/shared-instance/instance-statistics.component.html 41 src/app/shared/shared-instance/instance-statistics.component.html 75
-
+
of hosted video
الفيديو المستضاف
src/app/shared/shared-instance/instance-statistics.component.html 51
-
+
Federation
الفديرالية
src/app/shared/shared-instance/instance-statistics.component.html 58
-
+
followers
متابِعون
src/app/shared/shared-instance/instance-statistics.component.html 85
-
+
following
يتابِع
src/app/shared/shared-instance/instance-statistics.component.html 95
The upload failed
فشل الرفع
- src/app/helpers/utils.ts 177
+
+ src/app/helpers/utils.ts 186
The connection was interrupted
قُطع الاتصال
- src/app/helpers/utils.ts 181 src/app/helpers/utils.ts 190
+ The server encountered an error The server encountered an error
+
+ src/app/helpers/utils.ts
+ 193
+
Your
Your
- src/app/helpers/utils.ts 184
+
+ src/app/helpers/utils.ts 196
Your
حجم ملف
- src/app/helpers/utils.ts 188
+
+ src/app/helpers/utils.ts 200
User
مستخدم
src/app/core/users/user.service.ts 405
-
+
Configuration warning!
تحذير التكوين!
src/app/modal/instance-config-warning-modal.component.html 3
-
+
You enabled user registration on your instance but did not configure the following fields:
مكنت تسجيل المستخدمين الجدد على مثيل الخادم الخاص بك ولكنك لم تقم بتكوين الحقول التالية:
src/app/modal/instance-config-warning-modal.component.html 10
-
+
Instance name
اسم مثيل الخادم
src/app/modal/instance-config-warning-modal.component.html 13
-
+
Instance short description
وصف مختصر لمثيل الخادم
src/app/modal/instance-config-warning-modal.component.html 14
-
+
Who you are
من أنت
src/app/modal/instance-config-warning-modal.component.html 16
-
+
How long you plan to maintain your instance
إلى متى تخطط على إبقاء مثيل الخادم شغلًا
src/app/modal/instance-config-warning-modal.component.html 17
+
How you plan to pay for keeping your instance running How you plan to pay for keeping your instance running
src/app/modal/instance-config-warning-modal.component.html
@@ -587,23 +593,23 @@
-
+
How you will moderate your instance
كيف ستشرف على مثيل الخادم
src/app/modal/instance-config-warning-modal.component.html 20
-
+
Instance terms
شروط استخدام مثيل الخادم
src/app/modal/instance-config-warning-modal.component.html 21
-
+
My settings
إعداداتي
src/app/menu/menu.component.html 152 src/app/modal/quick-settings-modal.component.html 3
-
+
These settings apply only to your session on this instance.
تطبق هذه الإعدادات على جلساتك في هذا المثيل فقط.
@@ -611,244 +617,244 @@
8
-
+
Please consider configuring these fields to help people to choose
يرجى تكوين هذه الحقول لمساعدة الناس على اختيار
src/app/modal/instance-config-warning-modal.component.html 25
-
+
Don't show me this warning anymore
لا تريني هذا التحذير مجددًا
src/app/modal/instance-config-warning-modal.component.html 33
-
+
Close
اغلق
src/app/modal/instance-config-warning-modal.component.html 38 src/app/shared/shared-video-live/live-stream-information.component.html 33
-
+
Update live settings
حدّث إعدادات البث المباشر
src/app/shared/shared-video-live/live-stream-information.component.html 36
-
+
Configure
اضبط
src/app/modal/instance-config-warning-modal.component.html 44
-
+
Welcome to PeerTube, dear administrator!
مرحبًا بك في بيرتيوب ، مديرنا العزيز!
src/app/modal/welcome-modal.component.html 3
-
+
CLI documentation
وثائق CLI
src/app/modal/welcome-modal.component.html 12
-
+
Upload or import videos, parse logs, prune storage directories, reset user password...
ارفع أو استورد ملفات الفيديو ،راجع السجلات، نظف أدلة التخزين، أو أعد تعيين كلمة مرور المستخدم ...
src/app/modal/welcome-modal.component.html 15
-
+
Administer documentation
توثيق الإدارة
src/app/modal/welcome-modal.component.html 19
-
+
Managing users, following other instances, dealing with spammers...
إدارة المستخدمين ، متابعة مثيلات الخادم الأخرى ، التعامل مع مرسلي الرسائل غير المرغوب فيها ...
src/app/modal/welcome-modal.component.html 22
-
+
Use documentation
وثائق الاستخدام
src/app/modal/welcome-modal.component.html 26
-
+
Setup your account, managing video playlists, discover third-party applications...
قم بإعداد حسابك ، وإدارة قوائم تشغيل الفيديو ، واكتشاف تطبيقات الطرف الثالث ...
src/app/modal/welcome-modal.component.html 29
-
+
Useful links
روابط مفيدة
src/app/modal/welcome-modal.component.html 39
-
+
Official PeerTube website (news, support, contribute...):
موقع PeerTube الرسمي (الأخبار ، الدعم ، المساهمة ...):
src/app/modal/welcome-modal.component.html 42
-
+
Put your instance on the public PeerTube index:
أضف مثيل الخادم الخاص بك الى فهرس PeerTube العام:
src/app/modal/welcome-modal.component.html 45
-
+
It's time to configure your instance!
حان الوقت تكوين مثيل الخادم الخاص بك!
src/app/modal/welcome-modal.component.html 55
-
+
Choosing your
أختيارك
src/app/modal/welcome-modal.component.html 58
-
+
If you want to open registrations, please decide what
إذا أردت فتح التسجيل، رجاء حدد
src/app/modal/welcome-modal.component.html 64
-
+
Remind me later
ذكرني لاحقا
src/app/modal/welcome-modal.component.html 74
-
+
Configure my instance
كوّن مثيل الخادم الخاص بي
src/app/modal/welcome-modal.component.html 81
-
+
Close this message
أغلق هذه الرسالة
src/app/app.component.html 34 src/app/app.component.html 34
-
+
Change the language
غيّر اللغة
src/app/menu/language-chooser.component.html 3
-
+
Help to translate PeerTube!
ساهموا في ترجمة PeerTube!
src/app/menu/language-chooser.component.html 9
-
+
Settings
الإعدادات
src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html 27 src/app/+admin/plugins/plugin-search/plugin-search.component.html 53 src/app/+my-account/my-account-settings/my-account-settings.component.html 1
-
+
Display settings
اعدادات العرض
src/app/modal/quick-settings-modal.component.html 10
-
+
Video settings
إعدادات الفيديو
src/app/modal/quick-settings-modal.component.html 18
-
+
Interface settings
إعدادات الواجهة
src/app/modal/quick-settings-modal.component.html 22
-
+
Public profile
الملف الشخصي العام
src/app/menu/menu.component.html 23
-
+
Interface:
الواجهة:
src/app/menu/menu.component.html 30
-
+
Videos:
الفيديوهات:
src/app/menu/menu.component.html 37
-
+
Sensitive:
حساس:
src/app/menu/menu.component.html 47
-
+
Help share videos
ساهِم في مشاركة الفيديوهات
src/app/menu/menu.component.html 53
-
+
Keyboard shortcuts
اختصارات لوحة المفاتيح
src/app/menu/menu.component.html 62 src/app/menu/menu.component.html 174
-
+
powered by PeerTube - CopyLeft 2015-2021
يعمل بـ بيرتيوب - جميع الحقوق متروكة 2015-2021
src/app/menu/menu.component.html 179
-
+
Log out
خروج
src/app/menu/menu.component.html 67
-
+
My account
حسابي
src/app/menu/menu.component.html 78
-
+
My library
مكتبتي
src/app/menu/menu.component.html 83
-
+
Login
لِج
src/app/+login/login.component.html 44 src/app/menu/menu.component.html 94
-
+
Create an account
أنشئ حسابًا
src/app/+login/login.component.html 50 src/app/menu/menu.component.html 95
-
+
IN MY LIBRARY
في مكتبتي
src/app/menu/menu.component.html 99
-
+
Videos
الفيديوهات
src/app/menu/menu.component.html 103
-
+
Interface:
الواجهة:
src/app/menu/menu.component.html 165
-
+
Playlists
قوائم التشغيل
src/app/menu/menu.component.html 108
-
+
Subscriptions
الإشتراكات
src/app/menu/menu.component.html 113
-
+
History
السجل
src/app/menu/menu.component.html 118
-
+
VIDEOS
الفيديوهات
src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html 210
-
+
Import jobs concurrency
Import jobs concurrency
@@ -856,7 +862,7 @@
220
-
+
allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart.
السماح باستيراد متوازٍ لعدة فيديوهات. يحتاج الى إعادة تشغيل بيرتيوب ⚠️.
@@ -864,7 +870,7 @@
221
-
+
jobs in parallel
العمليات التي تعمل بالتوازي
@@ -876,109 +882,109 @@
171
-
+
Allow import with HTTP URL (e.g. YouTube)
اسمح بالاستيراد عبر الروابط (مثل يوتيوب)
src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html 234
-
+
Discover
اكتشف
src/app/+videos/video-list/overview/video-overview.component.html 1 src/app/menu/menu.component.html 128
-
+
Trending
الشائعة
src/app/menu/menu.component.html 133
-
+
Recently added
أُضيفت حديثًا
src/app/menu/menu.component.html 138
-
+
Administration
الإدارة
src/app/menu/menu.component.html 88
-
+
About
عن
src/app/menu/menu.component.html 157
-
+
Contact
اتصل
src/app/menu/menu.component.html 169
-
+
Help
مساعدة
src/app/menu/menu.component.html 170
-
+
Get help using PeerTube
احصل على تعليمات استخدام بيرتيوب
src/app/menu/menu.component.html 170
-
+
FAQ
الأسئلة الشائعة
src/app/menu/menu.component.html 171
-
+
Frequently asked questions about PeerTube
أسئلة متكررة حول بيرتيوب
src/app/menu/menu.component.html 171
-
+
Stats
الإحصائيات
src/app/menu/menu.component.html 172
-
+
API
API
src/app/menu/menu.component.html 173
-
+
API documentation
وثائق API
src/app/menu/menu.component.html 173
-
+
powered by PeerTube
يعمل بـ بيرتيوب
src/app/menu/menu.component.html 180
-
+
View your notifications
اعرض اشعاراتك
src/app/menu/notification.component.html 3 src/app/menu/notification.component.html 11 src/app/menu/notification.component.html 11
-
+
Notifications
الإشعارات
src/app/menu/notification.component.html 22 src/app/+my-account/my-account-notifications/my-account-notifications.component.html 1
-
+
Mark all as read
علّم الكل كمقروء
src/app/menu/notification.component.html 27 src/app/menu/notification.component.html 27 src/app/+my-account/my-account-notifications/my-account-notifications.component.html 20
-
+
Update your notification preferences
حدّث تفضيلات اشعاراتك
src/app/menu/notification.component.html 31
-
+
See all your notifications
اعرض كل اشعاراتك
src/app/menu/notification.component.html 49 I'm a teapot
src/app/+page-not-found/page-not-found.component.ts 27
-
+
That's an error.
هذا خطأ.
src/app/+page-not-found/page-not-found.component.html
4
-
+
We couldn't find any video tied to the URL We couldn't find any video tied to the URL
src/app/+page-not-found/page-not-found.component.html
7
-
+
We couldn't find any resource tied to the URL We couldn't find any resource tied to the URL
src/app/+page-not-found/page-not-found.component.html
@@ -1009,23 +1015,23 @@
-
+
Possible reasons:
الأسباب المحتملة:
Possible reasons preceding a list of reasons a `Not Found` error page may occur
src/app/+page-not-found/page-not-found.component.html 12
-
+
You may have used an outdated or broken link
استخدمت رابط معطل أو منتهي الصلاحية
- src/app/+page-not-found/page-not-found.component.html 15
+ src/app/+page-not-found/page-not-found.component.html 15
The video may have been moved or deleted The video may have been moved or deleted
src/app/+page-not-found/page-not-found.component.html
17
-
+
The resource may have been moved or deleted The resource may have been moved or deleted
src/app/+page-not-found/page-not-found.component.html
@@ -1033,22 +1039,22 @@
-
+
You may have typed the address or URL incorrectly
ربما أخطأت كتابة الرابط
src/app/+page-not-found/page-not-found.component.html 20
-
+
You are not authorized here.
You are not authorized here.
- src/app/+page-not-found/page-not-found.component.html 27
+ src/app/+page-not-found/page-not-found.component.html 27
You might need to check your account is allowed by the video or instance owner. You might need to check your account is allowed by the video or instance owner.
src/app/+page-not-found/page-not-found.component.html
30
-
+
You might need to check your account is allowed by the resource or instance owner. You might need to check your account is allowed by the resource or instance owner.
src/app/+page-not-found/page-not-found.component.html
@@ -1056,13 +1062,13 @@
-
+
The requested entity body blends sweet bits with a mellow earthiness.
The requested entity body blends sweet bits with a mellow earthiness.
Description of a tea flavour, keeping the 'requested entity body' as a technical expression referring to a web request
src/app/+page-not-found/page-not-found.component.html 40
-
+
Sepia seems to like it.
يبدو أنّه يعجب سبيا.
This is about Sepia's tea
@@ -1073,75 +1079,75 @@
هذا الملف كبير. اتصل بالمدير حتى يزيد حد الرفع.
src/app/core/rest/rest-extractor.service.ts 62
-
+
In this instance's network
في شبكة هذ المثيل
src/app/header/suggestion.component.html 14
-
+
In the vidiverse
في الكون
src/app/header/suggestion.component.html 15
-
+
Search videos, channels…
ابحث عن فيديوهات ، قنوات…
src/app/header/search-typeahead.component.html 3
-
+
GLOBAL SEARCH
بحث عالمي
src/app/header/search-typeahead.component.html 26
-
+
using
باستخدام
src/app/header/search-typeahead.component.html 28
-
+
Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.
سيزداد عدد النتائج باستخدام فهرس الطرف الثالث. سترسل البيانات اللازمة لإجراء الاستعلام فقط.
src/app/header/search-typeahead.component.html 32
+
Your query will be matched against video names or descriptions, channel names. Your query will be matched against video names or descriptions, channel names.
src/app/header/search-typeahead.component.html
37
-
+
ADVANCED SEARCH
البحث المتقدم
src/app/header/search-typeahead.component.html 39
-
+
any instance
أي مثيل خادم
src/app/header/search-typeahead.component.html 42
-
+
only followed instances
مثلاء الخادم المتّبعون فقط
src/app/header/search-typeahead.component.html 43
-
+
Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows.
يحدد ما إذا كان يمكنك حل أي محتوى بعيد ، أو إذا كان هذا المثيل يسمح فقط بالقيام بذلك المثلاء المتبعين.
src/app/header/search-typeahead.component.html 41
-
+
will list the matching channel
يسرد القناة المطابقة
src/app/header/search-typeahead.component.html 50 src/app/header/search-typeahead.component.html 53
-
+
will list the matching video
يسرد الفيديو المطابق
src/app/header/search-typeahead.component.html 56
-
+
Cancel
ألغِ
@@ -1162,58 +1168,58 @@
- src/app/+about/about-instance/contact-admin-modal.component.html 48 src/app/+login/login.component.html 117 src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html 25 src/app/+my-library/my-videos/modals/video-change-ownership.component.html 22 src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html 37 src/app/+videos/+video-edit/video-add-components/video-upload.component.html 58 src/app/+videos/+video-edit/video-add-components/video-upload.component.html 69 src/app/+videos/+video-watch/comment/video-comment-add.component.html 70 src/app/modal/confirm.component.html 20 src/app/shared/shared-abuse-list/moderation-comment-modal.component.html 26 src/app/shared/shared-moderation/batch-domains-modal.component.html 31 src/app/shared/shared-moderation/report-modals/report.component.html 54 src/app/shared/shared-moderation/report-modals/report.component.html 54 src/app/shared/shared-moderation/report-modals/video-report.component.html 92 src/app/shared/shared-moderation/user-ban-modal.component.html 26 src/app/shared/shared-moderation/video-block.component.html 38 src/app/shared/shared-video-miniature/video-download.component.html 134
-
+ src/app/+about/about-instance/contact-admin-modal.component.html 48 src/app/+login/login.component.html 117 src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html 20 src/app/+my-library/my-videos/modals/video-change-ownership.component.html 22 src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html 37 src/app/+videos/+video-edit/video-add-components/video-upload.component.html 69 src/app/+videos/+video-edit/video-add-components/video-upload.component.html 81 src/app/+videos/+video-watch/comment/video-comment-add.component.html 70 src/app/modal/confirm.component.html 20 src/app/shared/shared-abuse-list/moderation-comment-modal.component.html 26 src/app/shared/shared-moderation/batch-domains-modal.component.html 31 src/app/shared/shared-moderation/report-modals/report.component.html 54 src/app/shared/shared-moderation/report-modals/report.component.html 54 src/app/shared/shared-moderation/report-modals/video-report.component.html 92 src/app/shared/shared-moderation/user-ban-modal.component.html 26 src/app/shared/shared-moderation/video-block.component.html 38 src/app/shared/shared-video-miniature/video-download.component.html 134
+
Ban
احظر
src/app/shared/shared-moderation/user-ban-modal.component.html 3
-
+
Reason...
السبب…
src/app/shared/shared-moderation/user-ban-modal.component.html 12
-
+
A banned user will no longer be able to login.
لن يتمكن المستخدم المحظور من الولوج.
src/app/shared/shared-moderation/user-ban-modal.component.html 21
-
+
Ban this user
احظر هذا المستخدم
src/app/shared/shared-moderation/user-ban-modal.component.html 30
-
+
Block video "
احجب فيديو "
src/app/shared/shared-moderation/video-block.component.html 3
-
+
Block live "
احجب البث المباشر
src/app/shared/shared-moderation/video-block.component.html 4
-
+
Please describe the reason...
يرجى وصف السبب ...
src/app/shared/shared-moderation/video-block.component.html 13
-
+
This will ask remote instances to delete it
سيطلب من المثلاء البعدين حذفها
src/app/shared/shared-moderation/video-block.component.html 27
-
+
Blocking this live will automatically terminate the live stream.
حجب هذا البث المباشر سينهيه تلقائيا.
src/app/shared/shared-moderation/video-block.component.html 33
-
+
Unfederate the video
إعزل هذا الفيديو عن الاتحاد
src/app/shared/shared-moderation/video-block.component.html 24
-
+
Submit
أرسل
@@ -1223,19 +1229,19 @@
src/app/+about/about-instance/contact-admin-modal.component.html 52 src/app/+my-library/my-videos/modals/video-change-ownership.component.html 27 src/app/shared/shared-moderation/report-modals/report.component.html 58 src/app/shared/shared-moderation/report-modals/report.component.html 58 src/app/shared/shared-moderation/report-modals/video-report.component.html 96 src/app/shared/shared-moderation/video-block.component.html 42
-
+
Report video "
بلِّغ عن فيديو "
src/app/shared/shared-moderation/report-modals/video-report.component.html 3
-
+
What is the issue?
ما هي المشكلة؟
src/app/shared/shared-moderation/report-modals/report.component.html 13 src/app/shared/shared-moderation/report-modals/video-report.component.html 13 src/app/shared/shared-moderation/report-modals/report.component.html 13
-
+
Start at
ابدأ من
src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html 57 src/app/shared/shared-video-playlist/video-add-to-playlist.component.html 34 src/app/shared/shared-moderation/report-modals/video-report.component.html 47
-
+
Stop at
توقف عند
src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html 71 src/app/shared/shared-video-playlist/video-add-to-playlist.component.html 35 src/app/shared/shared-moderation/report-modals/video-report.component.html 62
-
+
Your report will be sent to moderators of
سيرسل الإبلاغ الى مشرفي
src/app/shared/shared-moderation/report-modals/video-report.component.html 74
-
+
Please describe the issue...
يرجى وصف المشكلة ...
src/app/shared/shared-moderation/report-modals/report.component.html 42 src/app/shared/shared-moderation/report-modals/video-report.component.html 80 src/app/shared/shared-moderation/report-modals/report.component.html 42
-
+
src/app/shared/shared-moderation/batch-domains-modal.component.html 3
-
+
1 host (without "http://") per line
مضيف واحد (بدون "http: //") لكل سطر
src/app/shared/shared-moderation/batch-domains-modal.component.html 11
-
+
Your report will be sent to moderators of
سيرسل الإبلاغ الى مشرفي
src/app/shared/shared-moderation/report-modals/report.component.html 36 49
-
+
Applications
Applications
@@ -1313,7 +1319,7 @@
3
-
+
SUBSCRIPTION FEED
SUBSCRIPTION FEED
@@ -1321,7 +1327,7 @@
8
-
+
Use third-party feed aggregators to retrieve the list of videos from channels you subscribed to.
Use third-party feed aggregators to retrieve the list of videos from channels you subscribed to.
@@ -1329,7 +1335,7 @@
10,12
-
+
Feed URL
رابط التلقيم
@@ -1337,7 +1343,7 @@
18
-
+
Feed Token
Feed Token
@@ -1345,7 +1351,7 @@
23
-
+
⚠️ Never share your feed token with anyone.
⚠️ Never share your feed token with anyone.
@@ -1353,7 +1359,7 @@
26
-
+
Renew token
Renew token
src/app/+my-account/my-account-applications/my-account-applications.component.html 35 تكرار الفيديو
src/app/+admin/admin.component.ts 39
-
+
Filter...
مرشح...
@@ -1377,7 +1383,7 @@
src/app/shared/shared-forms/advanced-input-filter.component.html 17
-
+
Clear filters
امسح المرشحات
@@ -1396,39 +1402,39 @@
src/app/shared/shared-forms/advanced-input-filter.component.html 23
-
+
Video/Comment/Account
فيديو\تعليق\حساب
src/app/shared/shared-abuse-list/abuse-list-table.component.html 22
-
+
Follower handle
مقبض تابع
src/app/+admin/follows/followers-list/followers-list.component.html 24
-
+
State
حالة
src/app/+admin/follows/followers-list/followers-list.component.html 25 src/app/+admin/follows/following-list/following-list.component.html 32 src/app/shared/shared-abuse-list/abuse-list-table.component.html 24
-
+
Messages
رسائل
src/app/shared/shared-abuse-list/abuse-list-table.component.html 25
-
+
Internal note
ملاحظة داخلية
src/app/shared/shared-abuse-list/abuse-list-table.component.html 26
-
+
Score
تقييم
src/app/+admin/follows/followers-list/followers-list.component.html 26
-
+
Created
أُنشئ
@@ -1437,108 +1443,108 @@
src/app/+admin/follows/followers-list/followers-list.component.html 27 src/app/+admin/follows/following-list/following-list.component.html 33 src/app/+admin/system/jobs/jobs.component.html 50 src/app/+my-library/my-video-imports/my-video-imports.component.html 20 src/app/shared/shared-abuse-list/abuse-list-table.component.html 23
-
+
Open actor page in a new tab
افتح صفحة الممثل في علامة تبويب جديدة
src/app/+admin/follows/followers-list/followers-list.component.html 42
-
+
Accepted
تم القبول
src/app/+admin/follows/followers-list/followers-list.component.html 49 src/app/+admin/follows/following-list/following-list.component.html 51
-
+
Pending
معلق
src/app/+admin/follows/followers-list/followers-list.component.html 52 src/app/+admin/follows/following-list/following-list.component.html 54
-
+
Accept
موافقة
- src/app/+admin/follows/followers-list/followers-list.component.html 35 src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html 30 src/app/+my-library/my-ownership/my-ownership.component.html 33
-
+ src/app/+admin/follows/followers-list/followers-list.component.html 35 src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.html 25 src/app/+my-library/my-ownership/my-ownership.component.html 33
+
Refuse
رفض
src/app/+admin/follows/followers-list/followers-list.component.html 36 src/app/+my-library/my-ownership/my-ownership.component.html 34
-
+
No follower found matching current filters.
لم يتم العثور على متابع مطابق للمرشحات الحالية.
src/app/+admin/follows/followers-list/followers-list.component.html 64
-
+
Your instance doesn't have any follower.
مثيل الخادم الخاص بك ليس لديه أي متابع.
src/app/+admin/follows/followers-list/followers-list.component.html 65
-
+
Showing
يعرض
src/app/+admin/follows/followers-list/followers-list.component.html 11
-
+
Instances you follow
المثلاء المتابَعون
src/app/+admin/follows/following-list/following-list.component.html 3
-
+
Host
المضيف
src/app/+admin/follows/following-list/following-list.component.html 31
-
+
Redundancy allowed
Redundancy allowed
src/app/+admin/follows/following-list/following-list.component.html 34
-
+
Unfollow
ألغ المتابعة
src/app/+admin/follows/following-list/following-list.component.html 41
-
+
Open instance in a new tab
افتح مثيل الخادم في لسان جديد
src/app/+admin/follows/following-list/following-list.component.html 44 src/app/shared/shared-moderation/server-blocklist.component.html 42 src/app/shared/shared-moderation/server-blocklist.component.html 42
-
+
No host found matching current filters.
لم يُعثر على مضيف مطابق للمرشحات الحالية.
src/app/+admin/follows/following-list/following-list.component.html 70
-
+
Your instance is not following anyone.
مثيل الخادم الخاص بك لا يتابع أي شخص.
src/app/+admin/follows/following-list/following-list.component.html 71
-
+
Showing
يعرض
src/app/+admin/follows/following-list/following-list.component.html 11
-
+
It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers.
يبدو أنك لست على خادم HTTPS. يحتاج خادم الويب الخاص بك إلى تنشيط TLS لمتابعة الخوادم.
src/app/+admin/follows/following-list/following-list.component.html 81
-
+
Follow domains
تابع النطاق
src/app/+admin/follows/following-list/following-list.component.html 78
-
+
Follow instances
Follow instances
- src/app/+admin/follows/following-list/following-list.component.html 18
+ src/app/+admin/follows/following-list/following-list.component.html 18
Action Action
@@ -1547,74 +1553,74 @@
src/app/+admin/follows/following-list/following-list.component.html 30 src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html 27 src/app/shared/shared-moderation/account-blocklist.component.html 22 src/app/shared/shared-moderation/account-blocklist.component.html 22 src/app/shared/shared-moderation/server-blocklist.component.html 30 src/app/shared/shared-moderation/server-blocklist.component.html 30
-
+
Videos redundancies
Videos redundancies
src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html 3
-
+
My videos duplicated by remote instances
كررت مقاطع الفيديو الخاصة بي بواسطة مثلاء بعيدين
src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html 12
-
+
Remote videos duplicated by my instance
كرر مثيل الخادم خاصتي مقاطع الفيديو البعيدة
src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html 13
-
+
Strategy
الاستراتيجية
