From: Chocobozzz Date: Mon, 11 Feb 2019 13:09:23 +0000 (+0100) Subject: Merge branch 'develop' into pr/1285 X-Git-Tag: v1.3.0-rc.1~205 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b718fd22374d64534bcfe69932cf562894abed6a;hp=adb115f5522bea4d52456a9fc5eb4140bb064476;p=github%2FChocobozzz%2FPeerTube.git Merge branch 'develop' into pr/1285 --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b733e4b6..13bec7535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,99 @@ # Changelog +## v1.2.0 + +### BREAKING CHANGES + + * **Docker:** `PEERTUBE_TRUST_PROXY` env variable is now an array ([LecygneNoir](https://github.com/LecygneNoir)) + * **Docker:** Check you have all the storage fields in your `/config/production.yaml` file: https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/config/production.yaml#L34 + * **nginx:** Add redundancy endpoint in static file. **You should add it in your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx** + * **nginx:** Add socket io endpoint. **You should add it in your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx** + * Moderators can manage users now (add/delete/update/block) + * Add `tmp` and `redundancy` directories in configuration file. **You should configure them in your production.yaml** + +### Maintenance + + * Check free storage before upgrading in upgrade script ([@Nutomic](https://github.com/nutomic)) + * Explain that PeerTube must be stopped in prune storage script + * Add some security directives in the systemd unit configuration file ([@rigelk](https://github.com/rigelk) & [@mkoppmann](https://github.com/mkoppmann)) + * Update FreeBSD startup script ([@gegeweb](https://github.com/gegeweb)) + +### Docker + + * Patch docker entrypoint to speed up the chown at startup ([LecygneNoir](https://github.com/LecygneNoir)) + +### Features + + * Add Russian, Polish and Italian languages + * Add user notifications: + * Notification types: + * Comment on my video + * New video from my subscriptions + * New video abuses (for moderators) + * Blacklist/Unblacklist on my video + * Video import finished (error or success) + * Pending video published (after transcoding or a scheduled update) + * My account or one of my channel has a new follower + * Someone (except muted accounts) mentioned me in comments + * A user registered on the instance (for moderators) + * Notification actions: + * Add a web notification + * Send an english email + * Add contact form in about page (**enabled by default**) + * Add ability to unfederate a local video in blacklist modal (**checkbox checked by default**) + * Support additional video extensions if transcoding is enabled (**enabled by default**) + * Redirect to the last url on login + * Add ability to automatically set the video caption in URL. Example: https://peertube2.cpy.re/videos/watch/9c9de5e8-0a1e-484a-b099-e80766180a6d?subtitle=ru + * Automatically enable the last selected caption when watching a video + * Add ability to disable, clear and list user videos history + * Add a button to help to translate peertube + * Add text in the report modal to explain to whom the report will be sent + * Open my account menu entries on hover + * Explain what features are enabled on the instance in the about page + * Add an error message in the forgot password modal if the instance email system is not configured + * Add sitemap + * Add well known url to change password ([@rigelk](https://github.com/rigelk)) + * Remove 8GB video upload limit on client side. There may still be such limit depending on the reverse proxy configuration ([@scanlime](https://github.com/scanlime)) + * Add CSP ([@rigelk](https://github.com/rigelk) & [@Nutomic](https://github.com/nutomic)) + * Update title and description HTML tags when rendering video HTML page + * Add webfinger support for remote follows ([@acid-chicken](https://github.com/acid-chicken)) + * Add tooltip to explain how the trending algorithm works ([@auberanger](https://github.com/auberanger)) + * Warn users when they want to delete a channel because they will not be able to create another channel with the same name + * Warn users when they leave the video upload/update (on page refresh/tab close) + * Set max user name, user display name, channel name and channel display name lengths to 50 characters ([@McFlat](https://github.com/mcflat)) + * Increase video abuse length to 3000 characters + * Add totalLocalVideoFilesSize in the stats endpoint + +## Bug fixes + + * Fix the addition of captions to a video + * Fix federation of some videos + * Fix NSFW blur on search + * Add error message when trying to upload .ass subtitles + * Fix default homepage in the progressive web application + * Don't crash on queue error + * Fix EXDEV errors if you have multiple mount points + * Fix broken audio in transcoding with some videos + * Fix crash on getVideoFileStream issue + * Fix followers search + * Remove trailing `/` in CLI import script ([@HesioZ](https://github.com/HesioZ/)) + * Use origin video url in canonical tag + * Fix captions in HTTP fallback + * Automatically refresh remote actors to fix deleted remote actors that are still displayed on some instances + * Add missing translations in video embed page + * Fix some styling issues in dark mode + * Fix transcoding issues with some videos + * Fix Mac OS mkv/avi upload + * Fix menu overflow on mobile + * Fix ownership button icons ([@joshmorel](https://github.com/joshmorel)) + + ## v1.1.0 ***Since v1.0.1*** ### BREAKING CHANGES + * **Docker:** `PEERTUBE_TRUST_PROXY` env variable is now an array ([LecygneNoir](https://github.com/LecygneNoir)) ### Maintenance diff --git a/README.md b/README.md index 7b2460f1e..a9b4eb54a 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ You can also join the cheerful bunch that makes our community: * Chat: * IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)** - * Matrix (bridged on the IRC channel) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)** + * Matrix (bridged on IRC and [Discord](https://discord.gg/wj8DDUT)) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)** * Forum: * Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube) diff --git a/client/package.json b/client/package.json index 5fe1f3d5f..3eea661f1 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "peertube-client", - "version": "1.1.0", + "version": "1.2.0", "private": true, "licence": "GPLv3", "author": { @@ -28,7 +28,8 @@ "resolutions": { "video.js": "^7", "webtorrent/create-torrent/junk": "^1", - "simple-get": "^2.8.1" + "simple-get": "^2.8.1", + "punycode": "^1.4.1" }, "jest": { "globals": { @@ -63,20 +64,20 @@ "setupTestFrameworkScriptFile": "/src/setupJest.ts" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.11.1", - "@angular/animations": "~7.1.1", - "@angular/cli": "~7.1.1", - "@angular/common": "~7.1.1", - "@angular/compiler": "~7.1.1", - "@angular/compiler-cli": "~7.1.1", - "@angular/core": "~7.1.1", - "@angular/forms": "~7.1.1", - "@angular/http": "~7.1.1", - "@angular/language-service": "~7.1.1", - "@angular/platform-browser": "~7.1.1", - "@angular/platform-browser-dynamic": "~7.1.1", - "@angular/router": "~7.1.1", - "@angular/service-worker": "~7.1.1", + "@angular-devkit/build-angular": "~0.13.1", + "@angular/animations": "~7.2.4", + "@angular/cli": "~7.3.1", + "@angular/common": "~7.2.4", + "@angular/compiler": "~7.2.4", + "@angular/compiler-cli": "~7.2.4", + "@angular/core": "~7.2.4", + "@angular/forms": "~7.2.4", + "@angular/http": "~7.2.4", + "@angular/language-service": "~7.2.4", + "@angular/platform-browser": "~7.2.4", + "@angular/platform-browser-dynamic": "~7.2.4", + "@angular/router": "~7.2.4", + "@angular/service-worker": "~7.2.4", "@angularclass/hmr": "^2.1.3", "@neos21/bootstrap3-glyphicons": "^1.0.1", "@ng-bootstrap/ng-bootstrap": "^4.0.0", @@ -85,7 +86,9 @@ "@ngx-loading-bar/router": "^3.0.0", "@ngx-meta/core": "^6.0.0-rc.1", "@ngx-translate/i18n-polyfill": "^1.0.0", + "@streamroot/videojs-hlsjs-plugin": "^1.0.7", "@types/core-js": "^2.5.0", + "@types/hls.js": "^0.12.0", "@types/jasmine": "^2.8.7", "@types/jasminewd2": "^2.0.3", "@types/jest": "^23.3.1", @@ -109,6 +112,7 @@ "extract-text-webpack-plugin": "4.0.0-beta.0", "file-loader": "^2.0.0", "focus-visible": "^4.1.5", + "hls.js": "^0.12.2", "html-loader": "^0.5.5", "html-webpack-plugin": "^3.2.0", "https-browserify": "^1.0.0", @@ -131,6 +135,7 @@ "ngx-qrcode2": "^0.0.9", "node-sass": "^4.9.3", "npm-font-source-sans-pro": "^1.0.2", + "p2p-media-loader-hlsjs": "^0.4.0", "path-browserify": "^1.0.0", "primeng": "^7.0.0", "process": "^0.11.10", @@ -152,9 +157,9 @@ "typescript": "3.1.6", "video.js": "^7", "videojs-contextmenu-ui": "^5.0.0", + "videojs-contrib-quality-levels": "^2.0.9", "videojs-dock": "^2.0.2", "videojs-hotkeys": "^0.2.21", - "webpack": "^4.17.1", "webpack-bundle-analyzer": "^3.0.2", "webpack-cli": "^3.0.8", "webtorrent": "https://github.com/webtorrent/webtorrent#e9b209c7970816fc29e0cc871157a4918d66001d", diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index d3ee8a1e4..a1b30fa8c 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core' import { Notifier, ServerService } from '@app/core' -import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' import { InstanceService } from '@app/shared/instance/instance.service' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-about-instance', diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html index 2b3fb32f3..b2cbd0873 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.html +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html @@ -1,7 +1,7 @@

Contact {{ instanceName }} administrator

- +
diff --git a/client/src/app/+accounts/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts index 6f3e6caa0..13890a0ee 100644 --- a/client/src/app/+accounts/account-about/account-about.component.ts +++ b/client/src/app/+accounts/account-about/account-about.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, OnDestroy } from '@angular/core' +import { Component, OnDestroy, OnInit } from '@angular/core' import { Account } from '@app/shared/account/account.model' import { AccountService } from '@app/shared/account/account.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { Subscription } from 'rxjs' -import { MarkdownService } from '@app/videos/shared' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-account-about', diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index 036264602..e8339b78b 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -26,8 +26,7 @@ export class AccountsComponent implements OnInit, OnDestroy { private notifier: Notifier, private restExtractor: RestExtractor, private redirectService: RedirectService, - private authService: AuthService, - private i18n: I18n + private authService: AuthService ) {} ngOnInit () { diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts index c06ae1d60..f7f347105 100644 --- a/client/src/app/+admin/admin.module.ts +++ b/client/src/app/+admin/admin.module.ts @@ -10,7 +10,7 @@ import { FollowingListComponent } from './follows/following-list/following-list. import { JobsComponent } from './jobs/job.component' import { JobsListComponent } from './jobs/jobs-list/jobs-list.component' import { JobService } from './jobs/shared/job.service' -import { UserCreateComponent, UserListComponent, UsersComponent, UserUpdateComponent } from './users' +import { UserCreateComponent, UserListComponent, UsersComponent, UserUpdateComponent, UserPasswordComponent } from './users' import { ModerationCommentModalComponent, VideoAbuseListComponent, VideoBlacklistListComponent } from './moderation' import { ModerationComponent } from '@app/+admin/moderation/moderation.component' import { RedundancyCheckboxComponent } from '@app/+admin/follows/shared/redundancy-checkbox.component' @@ -36,6 +36,7 @@ import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } f UsersComponent, UserCreateComponent, UserUpdateComponent, + UserPasswordComponent, UserListComponent, ModerationComponent, diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss index 02ccfc8ca..13b019c5b 100644 --- a/client/src/app/+admin/moderation/moderation.component.scss +++ b/client/src/app/+admin/moderation/moderation.component.scss @@ -10,6 +10,7 @@ font-weight: $font-semibold; min-width: 200px; display: inline-block; + vertical-align: top; } .moderation-expanded-text { diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html index 3a8424f68..303a788d2 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -1,7 +1,8 @@

Moderation comment

- + +
@@ -14,12 +15,12 @@
-
+
This comment can only be seen by you or the other moderators.
- Cancel + Cancel
- \ No newline at end of file + diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts index bebcb4207..f915978ee 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts @@ -45,7 +45,7 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI }) } - hideModerationCommentModal () { + hide () { this.abuseToComment = undefined this.openedModal.close() this.form.reset() @@ -60,7 +60,7 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI this.notifier.success(this.i18n('Comment updated.')) this.commentUpdated.emit(moderationComment) - this.hideModerationCommentModal() + this.hide() }, err => this.notifier.error(err.message) diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html index e862d5162..05b549de6 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html @@ -51,11 +51,11 @@
Reason: - {{ videoAbuse.reason }} +
Moderation comment: - {{ videoAbuse.moderationComment }} +
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index f64234b74..00c871659 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts @@ -9,6 +9,7 @@ import { DropdownAction } from '../../../shared/buttons/action-dropdown.componen import { ConfirmService } from '../../../core/index' import { ModerationCommentModalComponent } from './moderation-comment-modal.component' import { Video } from '../../../shared/video/video.model' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-abuse-list', @@ -30,7 +31,8 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { private notifier: Notifier, private videoAbuseService: VideoAbuseService, private confirmService: ConfirmService, - private i18n: I18n + private i18n: I18n, + private markdownRenderer: MarkdownService ) { super() @@ -108,6 +110,10 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { } + toHtml (text: string) { + return this.markdownRenderer.textMarkdownToHTML(text) + } + protected loadData () { return this.videoAbuseService.getVideoAbuses(this.pagination, this.sort) .subscribe( diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index 7cef787d2..247f441c1 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html @@ -7,6 +7,7 @@ Video name Sensitive + Unfederated Date @@ -26,7 +27,8 @@ - {{ videoBlacklist.video.nsfw }} + {{ booleanToText(videoBlacklist.video.nsfw) }} + {{ booleanToText(videoBlacklist.unfederated) }} {{ videoBlacklist.createdAt }} @@ -37,9 +39,9 @@ - + Blacklist reason: - {{ videoBlacklist.reason }} + diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index a02e84f67..b27bbbfef 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts @@ -7,6 +7,7 @@ import { VideoBlacklist } from '../../../../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { DropdownAction } from '../../../shared/buttons/action-dropdown.component' import { Video } from '../../../shared/video/video.model' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-blacklist-list', @@ -26,6 +27,7 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { private notifier: Notifier, private confirmService: ConfirmService, private videoBlacklistService: VideoBlacklistService, + private markdownRenderer: MarkdownService, private i18n: I18n ) { super() @@ -46,6 +48,16 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { return Video.buildClientUrl(videoBlacklist.video.uuid) } + booleanToText (value: boolean) { + if (value === true) return this.i18n('yes') + + return this.i18n('no') + } + + toHtml (text: string) { + return this.markdownRenderer.textMarkdownToHTML(text) + } + async removeVideoFromBlacklist (entry: VideoBlacklist) { const confirmMessage = this.i18n( 'Do you really want to remove this video from the blacklist? It will be available again in the videos list.' diff --git a/client/src/app/+admin/users/user-edit/index.ts b/client/src/app/+admin/users/user-edit/index.ts index fd80a02e0..ec734ef92 100644 --- a/client/src/app/+admin/users/user-edit/index.ts +++ b/client/src/app/+admin/users/user-edit/index.ts @@ -1,2 +1,3 @@ export * from './user-create.component' export * from './user-update.component' +export * from './user-password.component' diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html index 56cf7d17d..c6566da24 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/users/user-edit/user-edit.component.html @@ -81,3 +81,17 @@ + +
+ + +
+ + +
+ +
+ + +
+
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.scss b/client/src/app/+admin/users/user-edit/user-edit.component.scss index 6675f65cc..c1cc4ca45 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.scss +++ b/client/src/app/+admin/users/user-edit/user-edit.component.scss @@ -14,7 +14,7 @@ input:not([type=submit]) { @include peertube-select-container(340px); } -input[type=submit] { +input[type=submit], button { @include peertube-button; @include orange-button; @@ -25,3 +25,23 @@ input[type=submit] { margin-top: 5px; font-size: 11px; } + +.account-title { + @include in-content-small-title; + + margin-top: 55px; + margin-bottom: 30px; +} + +.danger-zone { + .reset-password-email { + margin-bottom: 30px; + padding-bottom: 30px; + border-bottom: 1px solid rgba(0, 0, 0, 0.1); + + button { + display: block; + margin-top: 0; + } + } +} diff --git a/client/src/app/+admin/users/user-edit/user-edit.ts b/client/src/app/+admin/users/user-edit/user-edit.ts index 0b3511e8e..649b35b0c 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/users/user-edit/user-edit.ts @@ -8,6 +8,7 @@ export abstract class UserEdit extends FormReactive { videoQuotaDailyOptions: { value: string, label: string }[] = [] roles = Object.keys(USER_ROLE_LABELS).map(key => ({ value: key.toString(), label: USER_ROLE_LABELS[key] })) username: string + userId: number protected abstract serverService: ServerService protected abstract configService: ConfigService @@ -22,7 +23,9 @@ export abstract class UserEdit extends FormReactive { } computeQuotaWithTranscoding () { - const resolutions = this.serverService.getConfig().transcoding.enabledResolutions + const transcodingConfig = this.serverService.getConfig().transcoding + + const resolutions = transcodingConfig.enabledResolutions const higherResolution = VideoResolution.H_1080P let multiplier = 0 @@ -30,9 +33,15 @@ export abstract class UserEdit extends FormReactive { multiplier += resolution / higherResolution } + if (transcodingConfig.hls.enabled) multiplier *= 2 + return multiplier * parseInt(this.form.value['videoQuota'], 10) } + resetPassword () { + return + } + protected buildQuotaOptions () { // These are used by a HTML select, so convert key into strings this.videoQuotaOptions = this.configService diff --git a/client/src/app/+admin/users/user-edit/user-password.component.html b/client/src/app/+admin/users/user-edit/user-password.component.html new file mode 100644 index 000000000..a1e1f6216 --- /dev/null +++ b/client/src/app/+admin/users/user-edit/user-password.component.html @@ -0,0 +1,21 @@ +
+
+ +
+ +
+ +
+
+
+ {{ formErrors.password }} +
+
+ + +
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.scss b/client/src/app/+admin/users/user-edit/user-password.component.scss new file mode 100644 index 000000000..217d585af --- /dev/null +++ b/client/src/app/+admin/users/user-edit/user-password.component.scss @@ -0,0 +1,22 @@ +@import '_variables'; +@import '_mixins'; + +input:not([type=submit]):not([type=checkbox]) { + @include peertube-input-text(340px); + + display: block; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-right: none; +} + +input[type=submit] { + @include peertube-button; + @include orange-button; + + margin-top: 10px; +} + +.input-group-append { + height: 30px; +} diff --git a/client/src/app/+admin/users/user-edit/user-password.component.ts b/client/src/app/+admin/users/user-edit/user-password.component.ts new file mode 100644 index 000000000..5b3040440 --- /dev/null +++ b/client/src/app/+admin/users/user-edit/user-password.component.ts @@ -0,0 +1,64 @@ +import { Component, Input, OnInit } from '@angular/core' +import { ActivatedRoute, Router } from '@angular/router' +import { UserService } from '@app/shared/users/user.service' +import { Notifier } from '../../../core' +import { User, UserUpdate } from '../../../../../../shared' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' +import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' +import { FormReactive } from '../../../shared' + +@Component({ + selector: 'my-user-password', + templateUrl: './user-password.component.html', + styleUrls: [ './user-password.component.scss' ] +}) +export class UserPasswordComponent extends FormReactive implements OnInit { + error: string + username: string + showPassword = false + + @Input() userId: number + + constructor ( + protected formValidatorService: FormValidatorService, + private userValidatorsService: UserValidatorsService, + private route: ActivatedRoute, + private router: Router, + private notifier: Notifier, + private userService: UserService, + private i18n: I18n + ) { + super() + } + + ngOnInit () { + this.buildForm({ + password: this.userValidatorsService.USER_PASSWORD + }) + } + + formValidated () { + this.error = undefined + + const userUpdate: UserUpdate = this.form.value + + this.userService.updateUser(this.userId, userUpdate).subscribe( + () => { + this.notifier.success( + this.i18n('Password changed for user {{username}}.', { username: this.username }) + ) + }, + + err => this.error = err.message + ) + } + + togglePasswordVisibility () { + this.showPassword = !this.showPassword + } + + getFormButtonTitle () { + return this.i18n('Update user password') + } +} diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts index 61e641823..94ef87b08 100644 --- a/client/src/app/+admin/users/user-edit/user-update.component.ts +++ b/client/src/app/+admin/users/user-edit/user-update.component.ts @@ -19,6 +19,7 @@ import { UserService } from '@app/shared' export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { error: string userId: number + userEmail: string username: string private paramsSub: Subscription @@ -89,9 +90,22 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { return this.i18n('Update user') } + resetPassword () { + this.userService.askResetPassword(this.userEmail).subscribe( + () => { + this.notifier.success( + this.i18n('An email asking for password reset has been sent to {{username}}.', { username: this.username }) + ) + }, + + err => this.error = err.message + ) + } + private onUserFetched (userJson: User) { this.userId = userJson.id this.username = userJson.username + this.userEmail = userJson.email this.form.patchValue({ email: userJson.email, diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 556ab3c5d..69a4616a3 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html @@ -2,7 +2,7 @@
Users list
- + Create user
@@ -65,7 +65,9 @@ (banned) + {{ user.email }} + ? {{ user.email }} @@ -76,6 +78,7 @@ + {{ user.videoQuotaUsed }} / {{ user.videoQuota }} {{ user.roleLabel }} {{ user.createdAt }} diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss index f235769f0..5274be01c 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/users/user-list/user-list.component.scss @@ -2,7 +2,7 @@ @import '_mixins'; .add-button { - @include create-button('../../../../assets/images/global/add.svg'); + @include create-button; } tr.banned { @@ -23,4 +23,4 @@ tr.banned { input { @include peertube-input-text(250px); } -} \ No newline at end of file +} diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.scss b/client/src/app/+my-account/my-account-history/my-account-history.component.scss index 82150cbe3..e7c6863f1 100644 --- a/client/src/app/+my-account/my-account-history/my-account-history.component.scss +++ b/client/src/app/+my-account/my-account-history/my-account-history.component.scss @@ -65,10 +65,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 14px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html index b98a1087e..d518b22ec 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html @@ -1,7 +1,13 @@
- Notification preferences + + + Notification preferences + - +
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss index 86ac094c5..43d1f82ab 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss @@ -5,16 +5,18 @@ display: flex; justify-content: space-between; font-size: 15px; - margin-bottom: 10px; + margin-bottom: 20px; a { @include peertube-button-link; @include grey-button; + @include button-with-icon(18px, 3px, -1px); } button { @include peertube-button; @include grey-button; + @include button-with-icon(20px, 3px, -1px); } } diff --git a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html index fd7d7d23b..674a4e8a2 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html @@ -1,7 +1,8 @@

Accept ownership

- + +
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html index 379fd8bb1..5709e9f54 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html @@ -40,10 +40,10 @@ Refuse diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html index df74b19b6..51db2e75d 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html @@ -1,6 +1,6 @@
- + Create another video channel
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss index 472cbb723..77fce138b 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss @@ -2,7 +2,7 @@ @import '_mixins'; .create-button { - @include create-button('../../../assets/images/global/add.svg'); + @include create-button; } /deep/ .action-button { diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts index 0ab3e2067..da2c5bcd3 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts @@ -35,10 +35,14 @@ export class MyAccountVideoChannelsComponent implements OnInit { async deleteVideoChannel (videoChannel: VideoChannel) { const res = await this.confirmService.confirmWithInput( this.i18n( - 'Do you really want to delete {{videoChannelName}}? It will delete all videos uploaded in this channel too.', - { videoChannelName: videoChannel.displayName } + 'Do you really want to delete {{channelDisplayName}}? It will delete all videos uploaded in this channel, ' + + 'and you will not be able to create another channel with the same name ({{channelName}})!', + { channelDisplayName: videoChannel.displayName, channelName: videoChannel.name } + ), + this.i18n( + 'Please type the display name of the video channel ({{displayName}}) to confirm', + { displayName: videoChannel.displayName } ), - this.i18n('Please type the name of the video channel to confirm'), videoChannel.displayName, this.i18n('Delete') ) diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html index a6911e4bf..69748ef37 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html @@ -32,7 +32,7 @@ - + Delete
@@ -45,7 +45,7 @@ @@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss index a735562f8..39d0cf2f7 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss @@ -23,14 +23,11 @@ .action-button-delete-selection { @include peertube-button; @include orange-button; - } - - .icon.icon-delete-white { - @include icon(21px); + @include button-with-icon(21px); - position: relative; - top: -2px; - background-image: url('../../../assets/images/global/delete-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); + } } } } diff --git a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html index 7c0df850d..22f127904 100644 --- a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html +++ b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html @@ -1,7 +1,8 @@

Change ownership

- + +
diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts index ea7b0e118..895b19064 100644 --- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts +++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts @@ -3,7 +3,7 @@ import { VideoChannelService } from '@app/shared/video-channel/video-channel.ser import { VideoChannel } from '@app/shared/video-channel/video-channel.model' import { I18n } from '@ngx-translate/i18n-polyfill' import { Subscription } from 'rxjs' -import { MarkdownService } from '@app/videos/shared' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-channel-about', diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index 3a60139e1..d398d4f35 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html @@ -30,14 +30,16 @@
+ +
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 79ea32ced..eaa822e0f 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -3,12 +3,12 @@ import { catchError, map, mergeMap, share, tap } from 'rxjs/operators' import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { Router } from '@angular/router' -import { Notifier } from '@app/core/notification' +import { Notifier } from '@app/core/notification/notifier.service' import { OAuthClientLocal, User as UserServerModel, UserRefreshToken } from '../../../../../shared' import { User } from '../../../../../shared/models/users' import { UserLogin } from '../../../../../shared/models/users/user-login.model' import { environment } from '../../../environments/environment' -import { RestExtractor } from '../../shared/rest' +import { RestExtractor } from '../../shared/rest/rest-extractor.service' import { AuthStatus } from './auth-status.model' import { AuthUser } from './auth-user.model' import { objectToUrlEncoded } from '@app/shared/misc/utils' diff --git a/client/src/app/core/confirm/index.ts b/client/src/app/core/confirm/index.ts index 44aabfc13..aca591e1a 100644 --- a/client/src/app/core/confirm/index.ts +++ b/client/src/app/core/confirm/index.ts @@ -1,2 +1 @@ -export * from './confirm.component' export * from './confirm.service' diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index 7c0d4ac8f..4ef3b1e73 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -8,7 +8,7 @@ import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client' import { LoadingBarRouterModule } from '@ngx-loading-bar/router' import { AuthService } from './auth' -import { ConfirmComponent, ConfirmService } from './confirm' +import { ConfirmService } from './confirm' import { throwIfAlreadyLoaded } from './module-import-guard' import { LoginGuard, RedirectService, UserRightGuard } from './routing' import { ServerService } from './server' @@ -18,6 +18,7 @@ import { CheatSheetComponent } from './hotkeys' import { ToastModule } from 'primeng/toast' import { Notifier } from './notification' import { MessageService } from 'primeng/api' +import { UserNotificationSocket } from '@app/core/notification/user-notification-socket.service' @NgModule({ imports: [ @@ -37,7 +38,6 @@ import { MessageService } from 'primeng/api' ], declarations: [ - ConfirmComponent, CheatSheetComponent ], @@ -47,7 +47,6 @@ import { MessageService } from 'primeng/api' ToastModule, - ConfirmComponent, CheatSheetComponent ], @@ -60,7 +59,8 @@ import { MessageService } from 'primeng/api' UserRightGuard, RedirectService, Notifier, - MessageService + MessageService, + UserNotificationSocket ] }) export class CoreModule { diff --git a/client/src/app/core/notification/index.ts b/client/src/app/core/notification/index.ts index 8b0cfde5f..3e8d9ea65 100644 --- a/client/src/app/core/notification/index.ts +++ b/client/src/app/core/notification/index.ts @@ -1 +1,2 @@ export * from './notifier.service' +export * from './user-notification-socket.service' diff --git a/client/src/app/core/notification/user-notification-socket.service.ts b/client/src/app/core/notification/user-notification-socket.service.ts new file mode 100644 index 000000000..f367d9ae4 --- /dev/null +++ b/client/src/app/core/notification/user-notification-socket.service.ts @@ -0,0 +1,41 @@ +import { Injectable } from '@angular/core' +import { environment } from '../../../environments/environment' +import { UserNotification as UserNotificationServer } from '../../../../../shared' +import { Subject } from 'rxjs' +import * as io from 'socket.io-client' +import { AuthService } from '../auth' + +export type NotificationEvent = 'new' | 'read' | 'read-all' + +@Injectable() +export class UserNotificationSocket { + private notificationSubject = new Subject<{ type: NotificationEvent, notification?: UserNotificationServer }>() + + private socket: SocketIOClient.Socket + + constructor ( + private auth: AuthService + ) {} + + dispatch (type: NotificationEvent, notification?: UserNotificationServer) { + this.notificationSubject.next({ type, notification }) + } + + getMyNotificationsSocket () { + const socket = this.getSocket() + + socket.on('new-notification', (n: UserNotificationServer) => this.dispatch('new', n)) + + return this.notificationSubject.asObservable() + } + + private getSocket () { + if (this.socket) return this.socket + + this.socket = io(environment.apiUrl + '/user-notifications', { + query: { accessToken: this.auth.getAccessToken() } + }) + + return this.socket + } +} diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index f33e6f20c..c868ccdcc 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -51,7 +51,10 @@ export class ServerService { requiresEmailVerification: false }, transcoding: { - enabledResolutions: [] + enabledResolutions: [], + hls: { + enabled: false + } }, avatar: { file: { @@ -87,6 +90,11 @@ export class ServerService { enabled: false } } + }, + trending: { + videos: { + intervalDays: 0 + } } } private videoCategories: Array> = [] diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html index c23e0c55d..46a87c79c 100644 --- a/client/src/app/header/header.component.html +++ b/client/src/app/header/header.component.html @@ -5,6 +5,6 @@ - + Upload diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index 2f9820665..cea415d9b 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss @@ -6,6 +6,7 @@ padding-left: 10px; margin-right: 15px; padding-right: 40px; // For the search icon + font-size: 14px; &::placeholder { color: var(--inputPlaceholderColor); @@ -40,6 +41,7 @@ .upload-button { @include peertube-button-link; @include orange-button; + @include button-with-icon(22px, 3px, -1px); margin-right: 25px; @@ -47,15 +49,6 @@ margin-right: 0; } - .icon.icon-upload { - @include icon(22px); - - background-image: url('../../assets/images/header/upload-white.svg'); - height: 24px; - vertical-align: middle; - margin-right: 6px; - } - @media screen and (max-width: 600px) { margin-right: 10px; padding: 0 10px; diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index 9b8146624..4efe3fb22 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html @@ -55,7 +55,8 @@

Forgot your password

- + +
diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html index 2f0b7c669..4ef3f0e89 100644 --- a/client/src/app/menu/avatar-notification.component.html +++ b/client/src/app/menu/avatar-notification.component.html @@ -17,7 +17,7 @@ >
- + See all your notifications diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index c86667469..e785db788 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -3,7 +3,7 @@ /deep/ { .popover-notifications.popover { - max-width: 400px; + max-width: none; .popover-body { padding: 0; @@ -11,6 +11,7 @@ font-family: $main-fonts; overflow-y: auto; max-height: 500px; + width: 400px; box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30); .notifications-header { @@ -40,7 +41,7 @@ justify-content: center; font-weight: $font-semibold; color: var(--mainForegroundColor); - height: 30px; + padding: 7px 0; } } } @@ -71,7 +72,7 @@ justify-content: center; background-color: var(--mainColor); - color: var(--mainBackgroundColor); + color: var(#fff); font-size: 10px; font-weight: $font-semibold; @@ -80,3 +81,11 @@ height: 15px; } } + +@media screen and (max-width: $mobile-view) { + /deep/ { + .popover-notifications.popover .popover-body { + width: 400px; + } + } +} diff --git a/client/src/app/menu/avatar-notification.component.ts b/client/src/app/menu/avatar-notification.component.ts index 60e090726..f1af08096 100644 --- a/client/src/app/menu/avatar-notification.component.ts +++ b/client/src/app/menu/avatar-notification.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core' import { User } from '../shared/users/user.model' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { Subscription } from 'rxjs' -import { Notifier } from '@app/core' +import { Notifier, UserNotificationSocket } from '@app/core' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { NavigationEnd, Router } from '@angular/router' import { filter } from 'rxjs/operators' @@ -23,6 +23,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy { constructor ( private userNotificationService: UserNotificationService, + private userNotificationSocket: UserNotificationSocket, private notifier: Notifier, private router: Router ) {} @@ -53,7 +54,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy { } private subscribeToNotifications () { - this.notificationSub = this.userNotificationService.getMyNotificationsSocket() + this.notificationSub = this.userNotificationSocket.getMyNotificationsSocket() .subscribe(data => { if (data.type === 'new') return this.unreadNotifications++ if (data.type === 'read') return this.unreadNotifications-- diff --git a/client/src/app/menu/language-chooser.component.html b/client/src/app/menu/language-chooser.component.html index c79609898..a62b33dda 100644 --- a/client/src/app/menu/language-chooser.component.html +++ b/client/src/app/menu/language-chooser.component.html @@ -1,7 +1,7 @@

Change the language

- +
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index a4aaadc7f..f30b89413 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -16,7 +16,7 @@ menu { height: 100%; white-space: nowrap; text-overflow: ellipsis; - overflow: hidden; + overflow: auto; color: var(--menuForegroundColor); display: flex; flex-direction: column; @@ -243,7 +243,7 @@ menu { } } -@media screen and (max-width: 400px) { +@media screen and (max-width: $mobile-view) { .menu-wrapper { width: 100% !important; } diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index 3a87ea1de..82a5f0f26 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html @@ -48,7 +48,7 @@
- +
{{ result.name }} diff --git a/client/src/app/search/search.component.scss b/client/src/app/search/search.component.scss index 3e074621b..6de13d276 100644 --- a/client/src/app/search/search.component.scss +++ b/client/src/app/search/search.component.scss @@ -87,10 +87,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 14px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts index 474b72824..c4a4b1fde 100644 --- a/client/src/app/search/search.component.ts +++ b/client/src/app/search/search.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' -import { AuthService, Notifier } from '@app/core' +import { AuthService, Notifier, ServerService } from '@app/core' import { forkJoin, Subscription } from 'rxjs' import { SearchService } from '@app/search/search.service' import { ComponentPagination } from '@app/shared/rest/component-pagination.model' @@ -41,7 +41,8 @@ export class SearchComponent implements OnInit, OnDestroy { private metaService: MetaService, private notifier: Notifier, private searchService: SearchService, - private authService: AuthService + private authService: AuthService, + private serverService: ServerService ) { } ngOnInit () { @@ -75,6 +76,10 @@ export class SearchComponent implements OnInit, OnDestroy { if (this.subActivatedRoute) this.subActivatedRoute.unsubscribe() } + isVideoBlur (video: Video) { + return video.isVideoNSFWForUser(this.authService.getUser(), this.serverService.getConfig()) + } + isVideoChannel (d: VideoChannel | Video): d is VideoChannel { return d instanceof VideoChannel } diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts index 811afb449..adecec1fc 100644 --- a/client/src/app/shared/actor/actor.model.ts +++ b/client/src/app/shared/actor/actor.model.ts @@ -16,7 +16,7 @@ export abstract class Actor implements ActorServer { avatarUrl: string - static GET_ACTOR_AVATAR_URL (actor: { avatar: Avatar }) { + static GET_ACTOR_AVATAR_URL (actor: { avatar?: { path: string } }) { const absoluteAPIUrl = getAbsoluteAPIUrl() if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path diff --git a/client/src/app/shared/buttons/action-dropdown.component.html b/client/src/app/shared/buttons/action-dropdown.component.html index 90651f217..114b1d71f 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.html +++ b/client/src/app/shared/buttons/action-dropdown.component.html @@ -3,7 +3,7 @@ class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange' }" ngbDropdownToggle role="button" > - + {{ label }}
diff --git a/client/src/app/shared/buttons/action-dropdown.component.scss b/client/src/app/shared/buttons/action-dropdown.component.scss index a4fcceeee..985b2ca88 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.scss +++ b/client/src/app/shared/buttons/action-dropdown.component.scss @@ -24,14 +24,11 @@ } &:hover, &:active, &:focus { - background-color: $grey-color; + background-color: $grey-background-color; } - .icon-action { - @include icon(21px); - - background-image: url('../../../assets/images/video/more.svg'); - top: -1px; + .more-icon { + width: 21px; } &.small { diff --git a/client/src/app/shared/buttons/button.component.html b/client/src/app/shared/buttons/button.component.html index 87a8daccf..b6df67102 100644 --- a/client/src/app/shared/buttons/button.component.html +++ b/client/src/app/shared/buttons/button.component.html @@ -1,4 +1,4 @@ - + {{ label }} diff --git a/client/src/app/shared/buttons/button.component.scss b/client/src/app/shared/buttons/button.component.scss index 168102f09..04199a2a9 100644 --- a/client/src/app/shared/buttons/button.component.scss +++ b/client/src/app/shared/buttons/button.component.scss @@ -3,41 +3,18 @@ .action-button { @include peertube-button-link; + @include button-with-icon(21px, 0, -2px); - font-size: 15px; font-weight: $font-semibold; - color: #585858; - background-color: #E5E5E5; + color: $grey-foreground-color; + background-color: $grey-background-color; &:hover { - background-color: #EFEFEF; + background-color: $grey-background-hover-color; } - .icon { - @include icon(21px); - - position: relative; - top: -2px; - - &.icon-edit { - background-image: url('../../../assets/images/global/edit-grey.svg'); - } - - &.icon-delete-grey { - background-image: url('../../../assets/images/global/delete-grey.svg'); - } - - &.icon-im-with-her { - background-image: url('../../../assets/images/global/im-with-her.svg'); - } - - &.icon-tick { - background-image: url('../../../assets/images/global/tick.svg'); - } - - &.icon-cross { - background-image: url('../../../assets/images/global/cross.svg'); - } + my-global-icon { + @include apply-svg-color($grey-foreground-color); } } diff --git a/client/src/app/shared/buttons/button.component.ts b/client/src/app/shared/buttons/button.component.ts index 1a1162f09..a91e9c7eb 100644 --- a/client/src/app/shared/buttons/button.component.ts +++ b/client/src/app/shared/buttons/button.component.ts @@ -1,4 +1,5 @@ import { Component, Input } from '@angular/core' +import { GlobalIconName } from '@app/shared/icons/global-icon.component' @Component({ selector: 'my-button', @@ -9,7 +10,7 @@ import { Component, Input } from '@angular/core' export class ButtonComponent { @Input() label = '' @Input() className: string = undefined - @Input() icon: string = undefined + @Input() icon: GlobalIconName = undefined @Input() title: string = undefined getTitle () { diff --git a/client/src/app/shared/buttons/delete-button.component.html b/client/src/app/shared/buttons/delete-button.component.html index 6c55d8104..4d12a84c0 100644 --- a/client/src/app/shared/buttons/delete-button.component.html +++ b/client/src/app/shared/buttons/delete-button.component.html @@ -1,5 +1,5 @@ - + {{ label }} Delete diff --git a/client/src/app/shared/buttons/edit-button.component.html b/client/src/app/shared/buttons/edit-button.component.html index cecb780f3..da3addbae 100644 --- a/client/src/app/shared/buttons/edit-button.component.html +++ b/client/src/app/shared/buttons/edit-button.component.html @@ -1,5 +1,5 @@ - + {{ label }} Edit diff --git a/client/src/app/core/confirm/confirm.component.html b/client/src/app/shared/confirm/confirm.component.html similarity index 87% rename from client/src/app/core/confirm/confirm.component.html rename to client/src/app/shared/confirm/confirm.component.html index 43f0c6190..65df1cd4d 100644 --- a/client/src/app/core/confirm/confirm.component.html +++ b/client/src/app/shared/confirm/confirm.component.html @@ -2,7 +2,8 @@

{{ title }}

- + +
diff --git a/client/src/app/core/confirm/confirm.component.scss b/client/src/app/shared/confirm/confirm.component.scss similarity index 100% rename from client/src/app/core/confirm/confirm.component.scss rename to client/src/app/shared/confirm/confirm.component.scss diff --git a/client/src/app/core/confirm/confirm.component.ts b/client/src/app/shared/confirm/confirm.component.ts similarity index 96% rename from client/src/app/core/confirm/confirm.component.ts rename to client/src/app/shared/confirm/confirm.component.ts index 5138b7848..63c163da6 100644 --- a/client/src/app/core/confirm/confirm.component.ts +++ b/client/src/app/shared/confirm/confirm.component.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular/core' -import { ConfirmService } from './confirm.service' +import { ConfirmService } from '@app/core/confirm/confirm.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' diff --git a/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts b/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts index 6e9806611..fcc966b84 100644 --- a/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts +++ b/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts @@ -10,20 +10,20 @@ export class VideoAbuseValidatorsService { constructor (private i18n: I18n) { this.VIDEO_ABUSE_REASON = { - VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ], + VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(3000) ], MESSAGES: { 'required': this.i18n('Report reason is required.'), 'minlength': this.i18n('Report reason must be at least 2 characters long.'), - 'maxlength': this.i18n('Report reason cannot be more than 300 characters long.') + 'maxlength': this.i18n('Report reason cannot be more than 3000 characters long.') } } this.VIDEO_ABUSE_MODERATION_COMMENT = { - VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ], + VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(3000) ], MESSAGES: { 'required': this.i18n('Moderation comment is required.'), 'minlength': this.i18n('Moderation comment must be at least 2 characters long.'), - 'maxlength': this.i18n('Moderation comment cannot be more than 300 characters long.') + 'maxlength': this.i18n('Moderation comment cannot be more than 3000 characters long.') } } } diff --git a/client/src/app/shared/forms/markdown-textarea.component.ts b/client/src/app/shared/forms/markdown-textarea.component.ts index b99169ed2..e87aca0d4 100644 --- a/client/src/app/shared/forms/markdown-textarea.component.ts +++ b/client/src/app/shared/forms/markdown-textarea.component.ts @@ -1,10 +1,10 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators' import { Component, forwardRef, Input, OnInit } from '@angular/core' import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' -import { MarkdownService } from '@app/videos/shared' import { Subject } from 'rxjs' import truncate from 'lodash-es/truncate' import { ScreenService } from '@app/shared/misc/screen.service' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-markdown-textarea', diff --git a/client/src/app/shared/forms/reactive-file.component.ts b/client/src/app/shared/forms/reactive-file.component.ts index c3986838f..f60c38e8d 100644 --- a/client/src/app/shared/forms/reactive-file.component.ts +++ b/client/src/app/shared/forms/reactive-file.component.ts @@ -53,6 +53,17 @@ export class ReactiveFileComponent implements OnInit, ControlValueAccessor { return } + const extension = '.' + file.name.split('.').pop() + if (this.extensions.includes(extension) === false) { + const message = this.i18n( + 'PeerTube cannot handle this kind of file. Accepted extensions are {{extensions}}.', + { extensions: this.allowedExtensionsMessage } + ) + this.notifier.error(message) + + return + } + this.file = file this.propagateChange(this.file) diff --git a/client/src/app/shared/icons/global-icon.component.html b/client/src/app/shared/icons/global-icon.component.html new file mode 100644 index 000000000..e69de29bb diff --git a/client/src/app/shared/icons/global-icon.component.scss b/client/src/app/shared/icons/global-icon.component.scss new file mode 100644 index 000000000..6805fb6f7 --- /dev/null +++ b/client/src/app/shared/icons/global-icon.component.scss @@ -0,0 +1,4 @@ +/deep/ svg { + width: inherit; + height: inherit; +} diff --git a/client/src/app/shared/icons/global-icon.component.ts b/client/src/app/shared/icons/global-icon.component.ts new file mode 100644 index 000000000..e8ada0324 --- /dev/null +++ b/client/src/app/shared/icons/global-icon.component.ts @@ -0,0 +1,48 @@ +import { Component, ElementRef, Input, OnInit } from '@angular/core' + +const icons = { + 'add': require('../../../assets/images/global/add.html'), + 'syndication': require('../../../assets/images/global/syndication.html'), + 'help': require('../../../assets/images/global/help.html'), + 'sparkle': require('../../../assets/images/global/sparkle.html'), + 'alert': require('../../../assets/images/global/alert.html'), + 'cloud-error': require('../../../assets/images/global/cloud-error.html'), + 'user-add': require('../../../assets/images/global/user-add.html'), + 'no': require('../../../assets/images/global/no.html'), + 'cloud-download': require('../../../assets/images/global/cloud-download.html'), + 'undo': require('../../../assets/images/global/undo.html'), + 'circle-tick': require('../../../assets/images/global/circle-tick.html'), + 'cog': require('../../../assets/images/global/cog.html'), + 'download': require('../../../assets/images/global/download.html'), + 'edit': require('../../../assets/images/global/edit.html'), + 'im-with-her': require('../../../assets/images/global/im-with-her.html'), + 'delete': require('../../../assets/images/global/delete.html'), + 'cross': require('../../../assets/images/global/cross.html'), + 'validate': require('../../../assets/images/global/validate.html'), + 'tick': require('../../../assets/images/global/tick.html'), + 'dislike': require('../../../assets/images/video/dislike.html'), + 'heart': require('../../../assets/images/video/heart.html'), + 'like': require('../../../assets/images/video/like.html'), + 'more': require('../../../assets/images/video/more.html'), + 'share': require('../../../assets/images/video/share.html'), + 'upload': require('../../../assets/images/video/upload.html') +} + +export type GlobalIconName = keyof typeof icons + +@Component({ + selector: 'my-global-icon', + template: '', + styleUrls: [ './global-icon.component.scss' ] +}) +export class GlobalIconComponent implements OnInit { + @Input() iconName: GlobalIconName + + constructor (private el: ElementRef) {} + + ngOnInit () { + const nativeElement = this.el.nativeElement + + nativeElement.innerHTML = icons[this.iconName] + } +} diff --git a/client/src/app/shared/misc/help.component.html b/client/src/app/shared/misc/help.component.html index 08a2fc367..444425c9f 100644 --- a/client/src/app/shared/misc/help.component.html +++ b/client/src/app/shared/misc/help.component.html @@ -25,4 +25,6 @@ [autoClose]="true" (onHidden)="onPopoverHidden()" (onShown)="onPopoverShown()" -> +> + + diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 047e53fab..3898f3cda 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss @@ -2,13 +2,17 @@ @import '_mixins'; .help-tooltip-button { - @include icon(17px); - - position: relative; - top: -2px; - background-image: url('../../../assets/images/global/help.svg'); + cursor: pointer; border: none; - margin: 5px; + + my-global-icon { + width: 17px; + position: relative; + top: -2px; + margin: 5px; + + @include apply-svg-color(var(--mainForegroundColor)) + } } /deep/ { @@ -16,16 +20,21 @@ max-width: 300px; .popover-body { + font-family: $main-fonts; text-align: left; padding: 10px; font-size: 13px; - font-family: $main-fonts; - background-color: #fff; - color: #000; + background-color: var(--mainBackgroundColor); + color: var(--mainForegroundColor); box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); + p { + margin-bottom: 0; + } + ul { padding-left: 20px; + margin-bottom: 0; } } } diff --git a/client/src/app/shared/misc/help.component.ts b/client/src/app/shared/misc/help.component.ts index ba0452e77..f3426f70f 100644 --- a/client/src/app/shared/misc/help.component.ts +++ b/client/src/app/shared/misc/help.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core' -import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-help', diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index 78e8e9682..7cc6055c2 100644 --- a/client/src/app/shared/misc/utils.ts +++ b/client/src/app/shared/misc/utils.ts @@ -102,12 +102,18 @@ function objectToFormData (obj: any, form?: FormData, namespace?: string) { return fd } -function lineFeedToHtml (obj: any, keyToNormalize: string) { +function objectLineFeedToHtml (obj: any, keyToNormalize: string) { return immutableAssign(obj, { - [keyToNormalize]: obj[keyToNormalize].replace(/\r?\n|\r/g, '
') + [keyToNormalize]: lineFeedToHtml(obj[keyToNormalize]) }) } +function lineFeedToHtml (text: string) { + if (!text) return text + + return text.replace(/\r?\n|\r/g, '
') +} + function removeElementFromArray (arr: T[], elem: T) { const index = arr.indexOf(elem) if (index !== -1) arr.splice(index, 1) @@ -131,6 +137,7 @@ function scrollToTop () { export { sortBy, durationToString, + lineFeedToHtml, objectToUrlEncoded, getParameterByName, populateAsyncUserVideoChannels, @@ -138,7 +145,7 @@ export { dateToHuman, immutableAssign, objectToFormData, - lineFeedToHtml, + objectLineFeedToHtml, removeElementFromArray, scrollToTop } diff --git a/client/src/app/shared/moderation/user-ban-modal.component.html b/client/src/app/shared/moderation/user-ban-modal.component.html index fa5cb7404..f38ea543d 100644 --- a/client/src/app/shared/moderation/user-ban-modal.component.html +++ b/client/src/app/shared/moderation/user-ban-modal.component.html @@ -1,7 +1,8 @@

Ban

- + +
@@ -19,7 +20,7 @@
- Cancel + Cancel
- \ No newline at end of file + diff --git a/client/src/app/shared/moderation/user-ban-modal.component.ts b/client/src/app/shared/moderation/user-ban-modal.component.ts index f755ba0e8..942765301 100644 --- a/client/src/app/shared/moderation/user-ban-modal.component.ts +++ b/client/src/app/shared/moderation/user-ban-modal.component.ts @@ -42,7 +42,7 @@ export class UserBanModalComponent extends FormReactive implements OnInit { this.openedModal = this.modalService.open(this.modal) } - hideBanUserModal () { + hide () { this.usersToBan = undefined this.openedModal.close() } @@ -60,7 +60,7 @@ export class UserBanModalComponent extends FormReactive implements OnInit { this.notifier.success(message) this.userBanned.emit(this.usersToBan) - this.hideBanUserModal() + this.hide() }, err => this.notifier.error(err.message) diff --git a/client/src/app/shared/renderer/html-renderer.service.ts b/client/src/app/shared/renderer/html-renderer.service.ts new file mode 100644 index 000000000..d49df9b6d --- /dev/null +++ b/client/src/app/shared/renderer/html-renderer.service.ts @@ -0,0 +1,35 @@ +import { Injectable } from '@angular/core' +import { LinkifierService } from '@app/shared/renderer/linkifier.service' +import * as sanitizeHtml from 'sanitize-html' + +@Injectable() +export class HtmlRendererService { + + constructor (private linkifier: LinkifierService) { + + } + + toSafeHtml (text: string) { + // Convert possible markdown to html + const html = this.linkifier.linkify(text) + + return sanitizeHtml(html, { + allowedTags: [ 'a', 'p', 'span', 'br' ], + allowedSchemes: [ 'http', 'https' ], + allowedAttributes: { + 'a': [ 'href', 'class', 'target' ] + }, + transformTags: { + a: (tagName, attribs) => { + return { + tagName, + attribs: Object.assign(attribs, { + target: '_blank', + rel: 'noopener noreferrer' + }) + } + } + } + }) + } +} diff --git a/client/src/app/shared/renderer/index.ts b/client/src/app/shared/renderer/index.ts new file mode 100644 index 000000000..39202b385 --- /dev/null +++ b/client/src/app/shared/renderer/index.ts @@ -0,0 +1,3 @@ +export * from './html-renderer.service' +export * from './linkifier.service' +export * from './markdown.service' diff --git a/client/src/app/videos/+video-watch/comment/linkifier.service.ts b/client/src/app/shared/renderer/linkifier.service.ts similarity index 100% rename from client/src/app/videos/+video-watch/comment/linkifier.service.ts rename to client/src/app/shared/renderer/linkifier.service.ts diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/shared/renderer/markdown.service.ts similarity index 100% rename from client/src/app/videos/shared/markdown.service.ts rename to client/src/app/shared/renderer/markdown.service.ts diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index d1320aeec..6f8625c7e 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -6,7 +6,6 @@ import { RouterModule } from '@angular/router' import { MarkdownTextareaComponent } from '@app/shared/forms/markdown-textarea.component' import { HelpComponent } from '@app/shared/misc/help.component' import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive' -import { MarkdownService } from '@app/videos/shared' import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared' @@ -34,10 +33,10 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { CustomConfigValidatorsService, + InstanceValidatorsService, LoginValidatorsService, ReactiveFileComponent, ResetPasswordValidatorsService, - InstanceValidatorsService, TextareaAutoResizeDirective, UserValidatorsService, VideoAbuseValidatorsService, @@ -67,6 +66,9 @@ import { UserHistoryService } from '@app/shared/users/user-history.service' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component' import { InstanceService } from '@app/shared/instance/instance.service' +import { HtmlRendererService, LinkifierService, MarkdownService } from '@app/shared/renderer' +import { ConfirmComponent } from '@app/shared/confirm/confirm.component' +import { GlobalIconComponent } from '@app/shared/icons/global-icon.component' @NgModule({ imports: [ @@ -110,7 +112,9 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserBanModalComponent, UserModerationDropdownComponent, TopMenuDropdownComponent, - UserNotificationsComponent + UserNotificationsComponent, + ConfirmComponent, + GlobalIconComponent ], exports: [ @@ -151,6 +155,8 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserModerationDropdownComponent, TopMenuDropdownComponent, UserNotificationsComponent, + ConfirmComponent, + GlobalIconComponent, NumberFormatterPipe, ObjectLengthPipe, @@ -167,7 +173,6 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserService, VideoService, AccountService, - MarkdownService, VideoChannelService, VideoCaptionService, VideoImportService, @@ -192,6 +197,10 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserHistoryService, InstanceService, + MarkdownService, + LinkifierService, + HtmlRendererService, + I18nPrimengCalendarService, ScreenService, diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index 5ff816fb8..125d2120c 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -1,4 +1,5 @@ -import { UserNotification as UserNotificationServer, UserNotificationType, VideoInfo } from '../../../../../shared' +import { UserNotification as UserNotificationServer, UserNotificationType, VideoInfo, ActorInfo } from '../../../../../shared' +import { Actor } from '@app/shared/actor/actor.model' export class UserNotification implements UserNotificationServer { id: number @@ -6,10 +7,7 @@ export class UserNotification implements UserNotificationServer { read: boolean video?: VideoInfo & { - channel: { - id: number - displayName: string - } + channel: ActorInfo & { avatarUrl?: string } } videoImport?: { @@ -23,10 +21,7 @@ export class UserNotification implements UserNotificationServer { comment?: { id: number threadId: number - account: { - id: number - displayName: string - } + account: ActorInfo & { avatarUrl?: string } video: VideoInfo } @@ -40,18 +35,11 @@ export class UserNotification implements UserNotificationServer { video: VideoInfo } - account?: { - id: number - displayName: string - name: string - } + account?: ActorInfo & { avatarUrl?: string } actorFollow?: { id: number - follower: { - name: string - displayName: string - } + follower: ActorInfo & { avatarUrl?: string } following: { type: 'account' | 'channel' name: string @@ -76,12 +64,22 @@ export class UserNotification implements UserNotificationServer { this.read = hash.read this.video = hash.video + if (this.video) this.setAvatarUrl(this.video.channel) + this.videoImport = hash.videoImport + this.comment = hash.comment + if (this.comment) this.setAvatarUrl(this.comment.account) + this.videoAbuse = hash.videoAbuse + this.videoBlacklist = hash.videoBlacklist + this.account = hash.account + if (this.account) this.setAvatarUrl(this.account) + this.actorFollow = hash.actorFollow + if (this.actorFollow) this.setAvatarUrl(this.actorFollow.follower) this.createdAt = hash.createdAt this.updatedAt = hash.updatedAt @@ -97,6 +95,7 @@ export class UserNotification implements UserNotificationServer { case UserNotificationType.NEW_COMMENT_ON_MY_VIDEO: case UserNotificationType.COMMENT_MENTION: + this.accountUrl = this.buildAccountUrl(this.comment.account) this.commentUrl = [ this.buildVideoUrl(this.comment.video), { threadId: this.comment.threadId } ] break @@ -138,8 +137,8 @@ export class UserNotification implements UserNotificationServer { return '/videos/watch/' + video.uuid } - private buildAccountUrl (account: { name: string }) { - return '/accounts/' + account.name + private buildAccountUrl (account: { name: string, host: string }) { + return '/accounts/' + Actor.CREATE_BY_STRING(account.name, account.host) } private buildVideoImportUrl () { @@ -150,4 +149,7 @@ export class UserNotification implements UserNotificationServer { return videoImport.targetUrl || videoImport.magnetUri || videoImport.torrentName } + private setAvatarUrl (actor: { avatarUrl?: string, avatar?: { path: string } }) { + actor.avatarUrl = Actor.GET_ACTOR_AVATAR_URL(actor) + } } diff --git a/client/src/app/shared/users/user-notification.service.ts b/client/src/app/shared/users/user-notification.service.ts index 2dfee8060..f8a30955d 100644 --- a/client/src/app/shared/users/user-notification.service.ts +++ b/client/src/app/shared/users/user-notification.service.ts @@ -1,30 +1,26 @@ import { Injectable } from '@angular/core' import { HttpClient, HttpParams } from '@angular/common/http' -import { RestExtractor, RestService } from '@app/shared/rest' +import { RestExtractor, RestService } from '../rest' import { catchError, map, tap } from 'rxjs/operators' import { environment } from '../../../environments/environment' import { ResultList, UserNotification as UserNotificationServer, UserNotificationSetting } from '../../../../../shared' -import { UserNotification } from '@app/shared/users/user-notification.model' -import { Subject } from 'rxjs' -import * as io from 'socket.io-client' -import { AuthService } from '@app/core' -import { ComponentPagination } from '@app/shared/rest/component-pagination.model' -import { User } from '@app/shared' +import { UserNotification } from './user-notification.model' +import { AuthService } from '../../core' +import { ComponentPagination } from '../rest/component-pagination.model' +import { User } from '..' +import { UserNotificationSocket } from '@app/core/notification/user-notification-socket.service' @Injectable() export class UserNotificationService { static BASE_NOTIFICATIONS_URL = environment.apiUrl + '/api/v1/users/me/notifications' static BASE_NOTIFICATION_SETTINGS = environment.apiUrl + '/api/v1/users/me/notification-settings' - private notificationSubject = new Subject<{ type: 'new' | 'read' | 'read-all', notification?: UserNotification }>() - - private socket: SocketIOClient.Socket - constructor ( private auth: AuthService, private authHttp: HttpClient, private restExtractor: RestExtractor, - private restService: RestService + private restService: RestService, + private userNotificationSocket: UserNotificationSocket ) {} listMyNotifications (pagination: ComponentPagination, unread?: boolean, ignoreLoadingBar = false) { @@ -48,16 +44,6 @@ export class UserNotificationService { .pipe(map(n => n.total)) } - getMyNotificationsSocket () { - const socket = this.getSocket() - - socket.on('new-notification', (n: UserNotificationServer) => { - this.notificationSubject.next({ type: 'new', notification: new UserNotification(n) }) - }) - - return this.notificationSubject.asObservable() - } - markAsRead (notification: UserNotification) { const url = UserNotificationService.BASE_NOTIFICATIONS_URL + '/read' @@ -67,7 +53,7 @@ export class UserNotificationService { return this.authHttp.post(url, body, { headers }) .pipe( map(this.restExtractor.extractDataBool), - tap(() => this.notificationSubject.next({ type: 'read' })), + tap(() => this.userNotificationSocket.dispatch('read')), catchError(res => this.restExtractor.handleError(res)) ) } @@ -79,7 +65,7 @@ export class UserNotificationService { return this.authHttp.post(url, {}, { headers }) .pipe( map(this.restExtractor.extractDataBool), - tap(() => this.notificationSubject.next({ type: 'read-all' })), + tap(() => this.userNotificationSocket.dispatch('read-all')), catchError(res => this.restExtractor.handleError(res)) ) } @@ -94,16 +80,6 @@ export class UserNotificationService { ) } - private getSocket () { - if (this.socket) return this.socket - - this.socket = io(environment.apiUrl + '/user-notifications', { - query: { accessToken: this.auth.getAccessToken() } - }) - - return this.socket - } - private formatNotification (notification: UserNotificationServer) { return new UserNotification(notification) } diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html index 86379d941..0d69e0feb 100644 --- a/client/src/app/shared/users/user-notifications.component.html +++ b/client/src/app/shared/users/user-notifications.component.html @@ -1,61 +1,101 @@
You don't have notifications.
-
+
-
+ - {{ notification.video.channel.displayName }} published a new video + + +
+ {{ notification.video.channel.displayName }} published a new video +
- Your video {{ notification.video.name }} has been unblacklisted + + +
+ Your video {{ notification.video.name }} has been unblacklisted +
- Your video {{ notification.videoBlacklist.video.name }} has been blacklisted + + +
+ Your video {{ notification.videoBlacklist.video.name }} has been blacklisted +
- A new video abuse has been created on video {{ notification.videoAbuse.video.name }} + + +
+ A new video abuse has been created on video {{ notification.videoAbuse.video.name }} +
- {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} + + +
+ {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} +
- Your video {{ notification.video.name }} has been published + + +
+ Your video {{ notification.video.name }} has been published +
- Your video import {{ notification.videoImportIdentifier }} succeeded + + +
+ Your video import {{ notification.videoImportIdentifier }} succeeded +
- Your video import {{ notification.videoImportIdentifier }} failed + + +
+ Your video import {{ notification.videoImportIdentifier }} failed +
- User {{ notification.account.name }} registered on your instance + + +
+ User {{ notification.account.name }} registered on your instance +
- {{ notification.actorFollow.follower.displayName }} is following + - - your channel {{ notification.actorFollow.following.displayName }} - - your account +
+ {{ notification.actorFollow.follower.displayName }} is following + + your channel {{ notification.actorFollow.following.displayName }} + your account +
- {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} + + +
+ {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} +
-
+ -
-
-
+
{{ notification.createdAt | myFromNow }}
diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss index 0493b10d9..315d504c9 100644 --- a/client/src/app/shared/users/user-notifications.component.scss +++ b/client/src/app/shared/users/user-notifications.component.scss @@ -1,30 +1,51 @@ +@import '_variables'; +@import '_mixins'; + +.no-notification { + display: flex; + justify-content: center; + align-items: center; + padding: 20px 0; +} + .notification { display: flex; - justify-content: space-between; align-items: center; font-size: inherit; - padding: 15px 10px; + padding: 15px 5px 15px 10px; border-bottom: 1px solid rgba(0, 0, 0, 0.10); - .mark-as-read { - min-width: 35px; + &.unread { + background-color: rgba(0, 0, 0, 0.05); + } + + my-global-icon { + width: 24px; + margin-right: 11px; + margin-left: 3px; - .glyphicon { - display: none; - cursor: pointer; - color: rgba(20, 20, 20, 0.5) - } + @include apply-svg-color(#333); } - &.unread { - background-color: rgba(0, 0, 0, 0.05); + .avatar { + @include avatar(30px); - &:hover .mark-as-read .glyphicon { - display: block; + margin-right: 10px; + } + + .message { + flex-grow: 1; - &:hover { - color: rgba(20, 20, 20, 0.8); - } + a { + font-weight: $font-semibold; } } + + .from-date { + font-size: 0.85em; + color: $grey-foreground-color; + padding-left: 5px; + min-width: 70px; + text-align: right; + } } diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts index 682116226..b5f9fd399 100644 --- a/client/src/app/shared/users/user-notifications.component.ts +++ b/client/src/app/shared/users/user-notifications.component.ts @@ -13,17 +13,14 @@ import { UserNotification } from '@app/shared/users/user-notification.model' export class UserNotificationsComponent implements OnInit { @Input() ignoreLoadingBar = false @Input() infiniteScroll = true + @Input() itemsPerPage = 20 notifications: UserNotification[] = [] // So we can access it in the template UserNotificationType = UserNotificationType - componentPagination: ComponentPagination = { - currentPage: 1, - itemsPerPage: 10, - totalItems: null - } + componentPagination: ComponentPagination constructor ( private userNotificationService: UserNotificationService, @@ -31,6 +28,12 @@ export class UserNotificationsComponent implements OnInit { ) { } ngOnInit () { + this.componentPagination = { + currentPage: 1, + itemsPerPage: this.itemsPerPage, // Reset items per page, because of the @Input() variable + totalItems: null + } + this.loadMoreNotifications() } @@ -57,6 +60,8 @@ export class UserNotificationsComponent implements OnInit { } markAsRead (notification: UserNotification) { + if (notification.read) return + this.userNotificationService.markAsRead(notification) .subscribe( () => { diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index 61b7e1b98..b0b59ea0c 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -32,9 +32,7 @@ export class VideoAbuseService { reportVideo (id: number, reason: string) { const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + id + '/abuse' - const body = { - reason - } + const body = { reason } return this.authHttp.post(url, body) .pipe( diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts index 7d39fd4f2..94e46d7c2 100644 --- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts +++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts @@ -36,8 +36,11 @@ export class VideoBlacklistService { ) } - blacklistVideo (videoId: number, reason?: string) { - const body = reason ? { reason } : {} + blacklistVideo (videoId: number, reason: string, unfederate: boolean) { + const body = { + unfederate, + reason + } return this.authHttp.post(VideoBlacklistService.BASE_VIDEOS_URL + videoId + '/blacklist', body) .pipe( diff --git a/client/src/app/shared/video-import/video-import.service.ts b/client/src/app/shared/video-import/video-import.service.ts index 11a7694c8..7ae13154d 100644 --- a/client/src/app/shared/video-import/video-import.service.ts +++ b/client/src/app/shared/video-import/video-import.service.ts @@ -82,6 +82,7 @@ export class VideoImportService { nsfw: video.nsfw, waitTranscoding: video.waitTranscoding, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, thumbnailfile: video.thumbnailfile, previewfile: video.previewfile, scheduleUpdate, diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html index 29492351b..1f97bc389 100644 --- a/client/src/app/shared/video/abstract-video-list.html +++ b/client/src/app/shared/video/abstract-video-list.html @@ -1,8 +1,11 @@
- {{ titlePage }} +
+ {{ titlePage }} +
+
diff --git a/client/src/app/shared/video/abstract-video-list.scss b/client/src/app/shared/video/abstract-video-list.scss index 9fb3fd4d6..292ede698 100644 --- a/client/src/app/shared/video/abstract-video-list.scss +++ b/client/src/app/shared/video/abstract-video-list.scss @@ -19,8 +19,8 @@ my-feed { display: inline-block; - position: relative; top: 1px; + min-width: 60px; } .moderation-block { diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index d234c8bfa..b0633be4a 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts @@ -39,6 +39,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { ownerDisplayType: OwnerDisplayType = 'account' firstLoadedPage: number displayModerationBlock = false + titleTooltip: string protected baseVideoWidth = 215 protected baseVideoHeight = 205 diff --git a/client/src/app/shared/video/feed.component.html b/client/src/app/shared/video/feed.component.html index 16116ba88..f7624ec01 100644 --- a/client/src/app/shared/video/feed.component.html +++ b/client/src/app/shared/video/feed.component.html @@ -1,10 +1,11 @@
- + class="icon-syndication" role="button" iconName="syndication" + > + {{ item.label }} -
\ No newline at end of file +
diff --git a/client/src/app/shared/video/feed.component.scss b/client/src/app/shared/video/feed.component.scss index 385764be0..ed1dc17d3 100644 --- a/client/src/app/shared/video/feed.component.scss +++ b/client/src/app/shared/video/feed.component.scss @@ -1,3 +1,4 @@ +@import '_variables'; @import '_mixins'; .video-feed { @@ -6,14 +7,12 @@ display: block; } - .icon { - @include icon(12px); + my-global-icon { + cursor: pointer; + width: 12px; + position: relative; + top: -2px; - &.icon-syndication { - position: relative; - top: -2px; - background-color: var(--mainForegroundColor); - mask-image: url('../../../assets/images/global/syndication.svg'); - } + @include apply-svg-color(var(--mainForegroundColor)) } -} \ No newline at end of file +} diff --git a/client/src/app/shared/video/video-details.model.ts b/client/src/app/shared/video/video-details.model.ts index fa4ca7f93..388357343 100644 --- a/client/src/app/shared/video/video-details.model.ts +++ b/client/src/app/shared/video/video-details.model.ts @@ -3,6 +3,8 @@ import { AuthUser } from '../../core' import { Video } from '../../shared/video/video.model' import { Account } from '@app/shared/account/account.model' import { VideoChannel } from '@app/shared/video-channel/video-channel.model' +import { VideoStreamingPlaylist } from '../../../../../shared/models/videos/video-streaming-playlist.model' +import { VideoStreamingPlaylistType } from '../../../../../shared/models/videos/video-streaming-playlist.type' export class VideoDetails extends Video implements VideoDetailsServerModel { descriptionPath: string @@ -12,6 +14,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { files: VideoFile[] account: Account commentsEnabled: boolean + downloadEnabled: boolean waitTranscoding: boolean state: VideoConstant @@ -19,6 +22,10 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { likesPercent: number dislikesPercent: number + trackerUrls: string[] + + streamingPlaylists: VideoStreamingPlaylist[] + constructor (hash: VideoDetailsServerModel, translations = {}) { super(hash, translations) @@ -29,6 +36,10 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { this.tags = hash.tags this.support = hash.support this.commentsEnabled = hash.commentsEnabled + this.downloadEnabled = hash.downloadEnabled + + this.trackerUrls = hash.trackerUrls + this.streamingPlaylists = hash.streamingPlaylists this.buildLikeAndDislikePercents() } @@ -53,4 +64,8 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { this.likesPercent = (this.likes / (this.likes + this.dislikes)) * 100 this.dislikesPercent = (this.dislikes / (this.likes + this.dislikes)) * 100 } + + getHlsPlaylist () { + return this.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + } } diff --git a/client/src/app/shared/video/video-edit.model.ts b/client/src/app/shared/video/video-edit.model.ts index 9078bb5d2..c5d5bb406 100644 --- a/client/src/app/shared/video/video-edit.model.ts +++ b/client/src/app/shared/video/video-edit.model.ts @@ -14,6 +14,7 @@ export class VideoEdit implements VideoUpdate { tags: string[] nsfw: boolean commentsEnabled: boolean + downloadEnabled: boolean waitTranscoding: boolean channelId: number privacy: VideoPrivacy @@ -27,7 +28,15 @@ export class VideoEdit implements VideoUpdate { scheduleUpdate?: VideoScheduleUpdate originallyPublishedAt?: Date | string - constructor (video?: Video & { tags: string[], commentsEnabled: boolean, support: string, thumbnailUrl: string, previewUrl: string }) { + constructor ( + video?: Video & { + tags: string[], + commentsEnabled: boolean, + downloadEnabled: boolean, + support: string, + thumbnailUrl: string, + previewUrl: string + }) { if (video) { this.id = video.id this.uuid = video.uuid @@ -39,6 +48,7 @@ export class VideoEdit implements VideoUpdate { this.tags = video.tags this.nsfw = video.nsfw this.commentsEnabled = video.commentsEnabled + this.downloadEnabled = video.downloadEnabled this.waitTranscoding = video.waitTranscoding this.channelId = video.channel.id this.privacy = video.privacy.id @@ -88,6 +98,7 @@ export class VideoEdit implements VideoUpdate { tags: this.tags, nsfw: this.nsfw, commentsEnabled: this.commentsEnabled, + downloadEnabled: this.downloadEnabled, waitTranscoding: this.waitTranscoding, channelId: this.channelId, privacy: this.privacy, diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss index 895879adc..f44bdf9a9 100644 --- a/client/src/app/shared/video/video-miniature.component.scss +++ b/client/src/app/shared/video/video-miniature.component.scss @@ -50,10 +50,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 13px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index c9b052951..460c09258 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts @@ -54,7 +54,7 @@ export class Video implements VideoServerModel { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } channel: { @@ -64,7 +64,7 @@ export class Video implements VideoServerModel { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } userHistory?: { diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 5d258891f..960846e21 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -96,6 +96,7 @@ export class VideoService implements VideosProvider { nsfw: video.nsfw, waitTranscoding: video.waitTranscoding, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, thumbnailfile: video.thumbnailfile, previewfile: video.previewfile, scheduleUpdate, diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html index 30aefdbfc..19043eee6 100644 --- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html +++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html @@ -3,7 +3,7 @@

Add caption

- +
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html index 23a71a068..2fb540170 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html @@ -134,11 +134,6 @@ i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default." > - - - + Add another caption
@@ -230,6 +225,16 @@ {{ formErrors.support }}
+ + + +
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index 25db8e8ed..bb775cb0a 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss @@ -23,10 +23,6 @@ my-peertube-checkbox { display: block; } - input, select { - font-size: 15px - } - .label-tags + span { font-size: 15px; } @@ -42,7 +38,7 @@ my-peertube-checkbox { text-align: right; .create-caption { - @include create-button('../../../../assets/images/global/add.svg'); + @include create-button; } } @@ -100,13 +96,14 @@ my-peertube-checkbox { display: inline-block; margin-right: 25px; - color: #585858; + color: $grey-foreground-color; font-size: 15px; } .submit-button { @include peertube-button; @include orange-button; + @include button-with-icon(20px, 1px); display: inline-block; @@ -119,16 +116,6 @@ my-peertube-checkbox { color: inherit; font-weight: $font-semibold; } - - .icon.icon-validate { - @include icon(20px); - - cursor: inherit; - position: relative; - top: -1px; - margin-right: 4px; - background-image: url('../../../../assets/images/global/validate.svg'); - } } } @@ -176,10 +163,10 @@ p-calendar { } tag { - background-color: var(--inputColor) !important; + background-color: $grey-background-color !important; + color: #000 !important; border-radius: 3px !important; font-size: 15px !important; - color: var(--mainForegroundColor) !important; height: 30px !important; line-height: 30px !important; margin: 0 5px 0 0 !important; @@ -202,7 +189,10 @@ p-calendar { top: -1px; height: auto !important; vertical-align: middle !important; - fill: #585858 !important; + + path { + fill: $grey-foreground-color !important; + } } &:hover { diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts index d02f18ee9..836452948 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts @@ -82,6 +82,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { const defaultValues: any = { nsfw: 'false', commentsEnabled: 'true', + downloadEnabled: 'true', waitTranscoding: 'true', tags: [] } @@ -91,6 +92,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { channelId: this.videoValidatorsService.VIDEO_CHANNEL, nsfw: null, commentsEnabled: null, + downloadEnabled: null, waitTranscoding: null, category: this.videoValidatorsService.VIDEO_CATEGORY, licence: this.videoValidatorsService.VIDEO_LICENCE, diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html index 11a81ad66..28eb143c9 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html @@ -1,6 +1,6 @@
-
-
+
+
Select the torrent to import @@ -66,7 +66,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - +
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss index 00626cd7b..6d59ed834 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss @@ -1,45 +1,7 @@ @import 'variables'; @import 'mixins'; -$width-size: 190px; - -.peertube-select-container { - @include peertube-select-container($width-size); -} - -.alert.alert-danger { - text-align: center; - - & > div { - font-weight: $font-semibold; - } -} - -.import-video-torrent { - display: flex; - flex-direction: column; - align-items: center; - - .icon.icon-upload { - @include icon(90px); - margin-bottom: 25px; - cursor: default; - - background-image: url('../../../../assets/images/video/upload.svg'); - } - - .button-file { - @include peertube-button-file(auto); - - min-width: 190px; - } - - .button-file-extension { - display: block; - font-size: 12px; - margin-top: 5px; - } - +.first-step-block { .torrent-or-magnet { margin: 10px 0; } @@ -47,19 +9,6 @@ $width-size: 190px; .form-group-magnet-uri { margin-bottom: 40px; } - - input[type=text] { - @include peertube-input-text($width-size); - display: block; - } - - input[type=button] { - @include peertube-button; - @include orange-button; - - width: $width-size; - margin-top: 30px; - } } diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts index 63db06919..c12a1d653 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts @@ -18,7 +18,8 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-import-torrent.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-import-torrent.component.scss' + './video-import-torrent.component.scss', + './video-send.scss' ] }) export class VideoImportTorrentComponent extends VideoSend implements OnInit, CanComponentDeactivate { @@ -78,6 +79,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Ca privacy: this.firstStepPrivacyId, waitTranscoding: false, commentsEnabled: true, + downloadEnabled: true, channelId: this.firstStepChannelId } @@ -92,6 +94,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Ca this.video = new VideoEdit(Object.assign(res.video, { commentsEnabled: videoUpdate.commentsEnabled, + downloadEnabled: videoUpdate.downloadEnabled, support: null, thumbnailUrl: null, previewUrl: null diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html index 533446672..3550c3585 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html @@ -1,6 +1,6 @@
-
-
+
+
@@ -59,7 +59,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - +
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts index a1810b7a0..d11685916 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts @@ -18,7 +18,7 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-import-url.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-import-url.component.scss' + './video-send.scss' ] }) export class VideoImportUrlComponent extends VideoSend implements OnInit, CanComponentDeactivate { @@ -70,6 +70,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom privacy: this.firstStepPrivacyId, waitTranscoding: false, commentsEnabled: true, + downloadEnabled: true, channelId: this.firstStepChannelId } @@ -84,6 +85,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom this.video = new VideoEdit(Object.assign(res.video, { commentsEnabled: videoUpdate.commentsEnabled, + downloadEnabled: videoUpdate.downloadEnabled, support: null, thumbnailUrl: null, previewUrl: null diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-send.scss similarity index 57% rename from client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss rename to client/src/app/videos/+video-edit/video-add-components/video-send.scss index e907edc70..8769dd302 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-send.scss @@ -3,10 +3,6 @@ $width-size: 190px; -.peertube-select-container { - @include peertube-select-container($width-size); -} - .alert.alert-danger { text-align: center; @@ -15,17 +11,20 @@ $width-size: 190px; } } -.import-video-url { +.first-step-block { display: flex; flex-direction: column; align-items: center; - .icon.icon-upload { - @include icon(90px); + .upload-icon { + width: 90px; margin-bottom: 25px; - cursor: default; - background-image: url('../../../../assets/images/video/upload.svg'); + @include apply-svg-color(#C6C6C6); + } + + .peertube-select-container { + @include peertube-select-container($width-size); } input[type=text] { @@ -40,6 +39,16 @@ $width-size: 190px; width: $width-size; margin-top: 30px; } -} + .button-file { + @include peertube-button-file(auto); + min-width: 190px; + } + + .button-file-extension { + display: block; + font-size: 12px; + margin-top: 5px; + } +} diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html index 289a28c66..b252cd60a 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html @@ -1,6 +1,6 @@
-
-
+
+
Select the file to upload @@ -42,6 +42,10 @@ {{ error }}
+
+ Congratulations! Your video is now available in your private library. +
+
- +
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss index 4b2c86ae9..8adf8f169 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss @@ -1,47 +1,9 @@ @import 'variables'; @import 'mixins'; -.peertube-select-container { - @include peertube-select-container(190px); -} - -.alert.alert-danger { - text-align: center; - - & > div { - font-weight: $font-semibold; - } -} - -.upload-video { - display: flex; - flex-direction: column; - align-items: center; - - .form-group-channel { - margin-bottom: 20px; - margin-top: 35px; - } - - .icon.icon-upload { - @include icon(90px); - margin-bottom: 25px; - cursor: default; - - background-image: url('../../../../assets/images/video/upload.svg'); - } - - .button-file { - @include peertube-button-file(auto); - - min-width: 190px; - } - - .button-file-extension { - display: block; - font-size: 12px; - margin-top: 5px; - } +.first-step-block .form-group-channel { + margin-bottom: 20px; + margin-top: 35px; } .upload-progress-cancel { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts index aa40f8781..9cadf52cb 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts @@ -20,7 +20,8 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-upload.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-upload.component.scss' + './video-upload.component.scss', + './video-send.scss' ] }) export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy, CanComponentDeactivate { @@ -165,6 +166,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy const nsfw = false const waitTranscoding = true const commentsEnabled = true + const downloadEnabled = true const channelId = this.firstStepChannelId.toString() const formData = new FormData() @@ -173,6 +175,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy formData.append('privacy', VideoPrivacy.PRIVATE.toString()) formData.append('nsfw', '' + nsfw) formData.append('commentsEnabled', '' + commentsEnabled) + formData.append('downloadEnabled', '' + downloadEnabled) formData.append('waitTranscoding', '' + waitTranscoding) formData.append('channelId', '' + channelId) formData.append('videofile', videofile) 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 57a9d0ca7..01fdfcb66 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,4 @@ -import { Component, ViewChild } from '@angular/core' +import { Component, HostListener, ViewChild } from '@angular/core' import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component' import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component' @@ -32,7 +32,17 @@ export class VideoAddComponent implements CanComponentDeactivate { this.secondStepType = undefined } - canDeactivate () { + @HostListener('window:beforeunload', [ '$event' ]) + onUnload (event: any) { + const { text, canDeactivate } = this.canDeactivate() + + if (canDeactivate) return + + event.returnValue = text + return text + } + + canDeactivate (): { canDeactivate: boolean, text?: string} { if (this.secondStepType === 'upload') return this.videoUpload.canDeactivate() if (this.secondStepType === 'import-url') return this.videoImportUrl.canDeactivate() if (this.secondStepType === 'import-torrent') return this.videoImportTorrent.canDeactivate() diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/videos/+video-edit/video-update.component.html index 0457778c0..4992bb369 100644 --- a/client/src/app/videos/+video-edit/video-update.component.html +++ b/client/src/app/videos/+video-edit/video-update.component.html @@ -13,7 +13,7 @@
- +
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts index d22ee540a..9e849014e 100644 --- a/client/src/app/videos/+video-edit/video-update.component.ts +++ b/client/src/app/videos/+video-edit/video-update.component.ts @@ -1,5 +1,5 @@ import { map, switchMap } from 'rxjs/operators' -import { Component, OnInit } from '@angular/core' +import { Component, HostListener, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' import { LoadingBarService } from '@ngx-loading-bar/core' import { Notifier } from '@app/core' @@ -83,14 +83,26 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { ) } - canDeactivate () { + @HostListener('window:beforeunload', [ '$event' ]) + onUnload (event: any) { + const { text, canDeactivate } = this.canDeactivate() + + if (canDeactivate) return + + event.returnValue = text + return text + } + + canDeactivate (): { canDeactivate: boolean, text?: string } { if (this.updateDone === true) return { canDeactivate: true } + const text = this.i18n('You have unsaved changes! If you leave, your changes will be lost.') + for (const caption of this.videoCaptions) { - if (caption.action) return { canDeactivate: false } + if (caption.action) return { canDeactivate: false, text } } - return { canDeactivate: this.formChanged === false } + return { canDeactivate: this.formChanged === false, text } } checkForm () { diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss index 84da5727e..731ecbf8f 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss +++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss @@ -41,7 +41,7 @@ } .comment-date { - color: #585858; + color: $grey-foreground-color; margin-left: 10px; } } @@ -69,7 +69,7 @@ .comment-action-reply, .comment-action-delete { - color: #585858; + color: $grey-foreground-color; cursor: pointer; margin-right: 10px; @@ -108,4 +108,4 @@ .root-comment { font-size: 14px; } -} \ No newline at end of file +} 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 00f0460a1..aba7f9d1c 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 @@ -1,11 +1,10 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core' -import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service' -import * as sanitizeHtml from 'sanitize-html' import { UserRight } from '../../../../../../shared/models/users' import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model' import { AuthService } from '../../../core/auth' import { Video } from '../../../shared/video/video.model' import { VideoComment } from './video-comment.model' +import { HtmlRendererService } from '@app/shared/renderer' @Component({ selector: 'my-video-comment', @@ -29,7 +28,7 @@ export class VideoCommentComponent implements OnInit, OnChanges { newParentComments: VideoComment[] = [] constructor ( - private linkifierService: LinkifierService, + private htmlRenderer: HtmlRendererService, private authService: AuthService ) {} @@ -87,27 +86,7 @@ export class VideoCommentComponent implements OnInit, OnChanges { } private init () { - // Convert possible markdown to html - const html = this.linkifierService.linkify(this.comment.text) - - this.sanitizedCommentHTML = sanitizeHtml(html, { - allowedTags: [ 'a', 'p', 'span', 'br' ], - allowedSchemes: [ 'http', 'https' ], - allowedAttributes: { - 'a': [ 'href', 'class', 'target' ] - }, - transformTags: { - a: (tagName, attribs) => { - return { - tagName, - attribs: Object.assign(attribs, { - target: '_blank', - rel: 'noopener noreferrer' - }) - } - } - } - }) + this.sanitizedCommentHTML = this.htmlRenderer.toSafeHtml(this.comment.text) this.newParentComments = this.parentComments.concat([ this.comment ]) } diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/videos/+video-watch/comment/video-comment.service.ts index 921447d5b..b8e5878c5 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment.service.ts @@ -1,7 +1,7 @@ import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { lineFeedToHtml } from '@app/shared/misc/utils' +import { objectLineFeedToHtml } from '@app/shared/misc/utils' import { Observable } from 'rxjs' import { ResultList, FeedFormat } from '../../../../../../shared/models' import { @@ -28,7 +28,7 @@ export class VideoCommentService { addCommentThread (videoId: number | string, comment: VideoCommentCreate) { const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comment-threads' - const normalizedComment = lineFeedToHtml(comment, 'text') + const normalizedComment = objectLineFeedToHtml(comment, 'text') return this.authHttp.post<{ comment: VideoCommentServerModel }>(url, normalizedComment) .pipe( @@ -39,7 +39,7 @@ export class VideoCommentService { addCommentReply (videoId: number | string, inReplyToCommentId: number, comment: VideoCommentCreate) { const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comments/' + inReplyToCommentId - const normalizedComment = lineFeedToHtml(comment, 'text') + const normalizedComment = objectLineFeedToHtml(comment, 'text') return this.authHttp.post<{ comment: VideoCommentServerModel }>(url, normalizedComment) .pipe( diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html index c436501b4..1a87bdcd4 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html @@ -1,7 +1,7 @@

Blacklist video

- +
@@ -15,6 +15,13 @@
+
+ +
+
Cancel diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts index 357ce39ce..50a7cadd1 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts @@ -34,9 +34,12 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit { } ngOnInit () { + const defaultValues = { unfederate: 'true' } + this.buildForm({ - reason: this.videoBlacklistValidatorsService.VIDEO_BLACKLIST_REASON - }) + reason: this.videoBlacklistValidatorsService.VIDEO_BLACKLIST_REASON, + unfederate: null + }, defaultValues) } show () { @@ -50,8 +53,9 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit { blacklist () { const reason = this.form.value[ 'reason' ] || undefined + const unfederate = this.video.isLocal ? this.form.value[ 'unfederate' ] : undefined - this.videoBlacklistService.blacklistVideo(this.video.id, reason) + this.videoBlacklistService.blacklistVideo(this.video.id, reason, unfederate) .subscribe( () => { this.notifier.success(this.i18n('Video blacklisted.')) diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.html b/client/src/app/videos/+video-watch/modal/video-download.component.html index f46f92a17..2bb5d6d37 100644 --- a/client/src/app/videos/+video-watch/modal/video-download.component.html +++ b/client/src/app/videos/+video-watch/modal/video-download.component.html @@ -1,7 +1,7 @@

Download video

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.html b/client/src/app/videos/+video-watch/modal/video-report.component.html index 733c01be0..b9434da26 100644 --- a/client/src/app/videos/+video-watch/modal/video-report.component.html +++ b/client/src/app/videos/+video-watch/modal/video-report.component.html @@ -1,7 +1,7 @@

Report video

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html index 301f67f2d..9f3c37fe8 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.html +++ b/client/src/app/videos/+video-watch/modal/video-share.component.html @@ -1,7 +1,7 @@

Share

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/videos/+video-watch/modal/video-support.component.html index 00c304709..2a05224a8 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.html +++ b/client/src/app/videos/+video-watch/modal/video-support.component.html @@ -1,7 +1,7 @@

Support

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/videos/+video-watch/modal/video-support.component.ts index 154002120..deb8fbc67 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-support.component.ts @@ -1,8 +1,7 @@ import { Component, Input, ViewChild } from '@angular/core' -import { MarkdownService } from '@app/videos/shared' - import { VideoDetails } from '../../../shared/video/video-details.model' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-support', diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 2cdbc7aa6..6e18ab6a6 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html @@ -52,55 +52,57 @@
- +
- +
- + Support
- + Share
- +
@@ -159,12 +161,9 @@ {{ video.privacy.label }}
-
- Originally published on - Unknown - - {{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }} - +
+ Originally published + {{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }}
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 f96ce8b8f..cfe3533b6 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -183,6 +183,8 @@ $other-videos-width: 260px; .action-button { @include peertube-button; @include grey-button; + @include button-with-icon(21px, 0, -1px); + @include apply-svg-color($grey-foreground-color); font-size: 15px; font-weight: $font-semibold; @@ -194,53 +196,25 @@ $other-videos-width: 260px; display: none; } - .icon { - @include icon(21px); - - position: relative; - top: -2px; - - &.icon-like { - background-image: url('../../../assets/images/video/like-grey.svg'); - } - - &.icon-dislike { - background-image: url('../../../assets/images/video/dislike-grey.svg'); - } - - &.icon-support { - background-image: url('../../../assets/images/video/heart.svg'); - } - - &.icon-share { - background-image: url('../../../assets/images/video/share.svg'); - } - - &.icon-more { - background-image: url('../../../assets/images/video/more.svg'); - top: -1px; - } - } - - .icon-text { - margin-left: 3px; - } - &.action-button-like.activated { background-color: $green; - .icon-like { - background-image: url('../../../assets/images/video/like-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); } } &.action-button-dislike.activated { background-color: $red; - .icon-dislike { - background-image: url('../../../assets/images/video/dislike-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); } } + + .icon-text { + margin-left: 3px; + } } .action-more { @@ -249,36 +223,12 @@ $other-videos-width: 260px; .dropdown-menu .dropdown-item { padding: 6px 24px; - .icon { - @include icon(24px); + my-global-icon { + width: 24px; margin-right: 10px; position: relative; - top: -1px; - - &.icon-download { - background-image: url('../../../assets/images/video/download-black.svg'); - } - - &.icon-edit { - background-image: url('../../../assets/images/global/edit-black.svg'); - } - - &.icon-alert { - background-image: url('../../../assets/images/video/alert.svg'); - } - - &.icon-blacklist { - background-image: url('../../../assets/images/video/blacklist.svg'); - } - - &.icon-unblacklist { - background-image: url('../../../assets/images/global/undo.svg'); - } - - &.icon-delete { - background-image: url('../../../assets/images/global/delete-black.svg'); - } + top: -2px; } } } @@ -320,7 +270,7 @@ $other-videos-width: 260px; .video-info-description-more { cursor: pointer; font-weight: $font-semibold; - color: #585858; + color: $grey-foreground-color; font-size: 14px; .glyphicon { @@ -339,7 +289,7 @@ $other-videos-width: 260px; min-width: 142px; padding-right: 5px; display: inline-block; - color: #585858; + color: $grey-foreground-color; font-weight: $font-bold; } 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 67c5254b3..4dbfa41e5 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -7,29 +7,27 @@ import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-supp import { MetaService } from '@ngx-meta/core' import { Notifier, ServerService } from '@app/core' import { forkJoin, Subscription } from 'rxjs' -// FIXME: something weird with our path definition in tsconfig and typings -// @ts-ignore -import videojs from 'video.js' -import 'videojs-hotkeys' import { Hotkey, HotkeysService } from 'angular2-hotkeys' -import * as WebTorrent from 'webtorrent' import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared' -import '../../../assets/player/peertube-videojs-plugin' import { AuthService, ConfirmService } from '../../core' import { RestExtractor, VideoBlacklistService } from '../../shared' import { VideoDetails } from '../../shared/video/video-details.model' import { VideoService } from '../../shared/video/video.service' -import { MarkdownService } from '../shared' import { VideoDownloadComponent } from './modal/video-download.component' import { VideoReportComponent } from './modal/video-report.component' import { VideoShareComponent } from './modal/video-share.component' import { VideoBlacklistComponent } from './modal/video-blacklist.component' import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component' -import { addContextMenu, getVideojsOptions, loadLocaleInVideoJS } from '../../../assets/player/peertube-player' import { I18n } from '@ngx-translate/i18n-polyfill' import { environment } from '../../../environments/environment' -import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' import { VideoCaptionService } from '@app/shared/video-caption' +import { MarkdownService } from '@app/shared/renderer' +import { + P2PMediaLoaderOptions, + PeertubePlayerManager, + PeertubePlayerManagerOptions, + PlayerMode +} from '../../../assets/player/peertube-player-manager' @Component({ selector: 'my-video-watch', @@ -46,7 +44,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { @ViewChild('videoBlacklistModal') videoBlacklistModal: VideoBlacklistComponent @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent - player: videojs.Player + player: any playerElement: HTMLVideoElement userRating: UserVideoRateType = null video: VideoDetails = null @@ -61,7 +59,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy { remoteServerDown = false hotkeys: Hotkey[] - private videojsLocaleLoaded = false private paramsSub: Subscription constructor ( @@ -92,7 +89,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { ngOnInit () { if ( - WebTorrent.WEBRTC_SUPPORT === false || + !!((window as any).RTCPeerConnection || (window as any).mozRTCPeerConnection || (window as any).webkitRTCPeerConnection) === false || peertubeLocalStorage.getItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY) === 'true' ) { this.hasAlreadyAcceptedPrivacyConcern = true @@ -118,8 +115,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy { .subscribe(([ video, captionsResult ]) => { const startTime = this.route.snapshot.queryParams.start const subtitle = this.route.snapshot.queryParams.subtitle + const playerMode = this.route.snapshot.queryParams.mode - this.onVideoFetched(video, captionsResult.data, { startTime, subtitle }) + this.onVideoFetched(video, captionsResult.data, { startTime, subtitle, playerMode }) .catch(err => this.handleError(err)) }) }) @@ -310,6 +308,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { return this.video && this.video.state.id === VideoState.TO_TRANSCODE } + isVideoDownloadable () { + return this.video && this.video.downloadEnabled + } + isVideoToImport () { return this.video && this.video.state.id === VideoState.TO_IMPORT } @@ -366,7 +368,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy { ) } - private async onVideoFetched (video: VideoDetails, videoCaptions: VideoCaption[], urlOptions: { startTime: number, subtitle: string }) { + private async onVideoFetched ( + video: VideoDetails, + videoCaptions: VideoCaption[], + urlOptions: { startTime?: number, subtitle?: string, playerMode?: string } + ) { this.video = video // Re init attributes @@ -402,41 +408,64 @@ export class VideoWatchComponent implements OnInit, OnDestroy { src: environment.apiUrl + c.captionPath })) - const videojsOptions = getVideojsOptions({ - autoplay: this.isAutoplay(), - inactivityTimeout: 2500, - videoFiles: this.video.files, - videoCaptions: playerCaptions, - playerElement: this.playerElement, - videoViewUrl: this.video.privacy.id !== VideoPrivacy.PRIVATE ? this.videoService.getVideoViewUrl(this.video.uuid) : null, - videoDuration: this.video.duration, - enableHotkeys: true, - peertubeLink: false, - poster: this.video.previewUrl, - startTime, - subtitle: urlOptions.subtitle, - theaterMode: true, - language: this.localeId, - - userWatching: this.user && this.user.videosHistoryEnabled === true ? { - url: this.videoService.getUserWatchingVideoUrl(this.video.uuid), - authorizationHeader: this.authService.getRequestHeaderValue() - } : undefined - }) + const options: PeertubePlayerManagerOptions = { + common: { + autoplay: this.isAutoplay(), + + playerElement: this.playerElement, + onPlayerElementChange: (element: HTMLVideoElement) => this.playerElement = element, + + videoDuration: this.video.duration, + enableHotkeys: true, + inactivityTimeout: 2500, + poster: this.video.previewUrl, + startTime, + + theaterMode: true, + captions: videoCaptions.length !== 0, + peertubeLink: false, + + videoViewUrl: this.video.privacy.id !== VideoPrivacy.PRIVATE ? this.videoService.getVideoViewUrl(this.video.uuid) : null, + embedUrl: this.video.embedUrl, + + language: this.localeId, + + subtitle: urlOptions.subtitle, + + userWatching: this.user && this.user.videosHistoryEnabled === true ? { + url: this.videoService.getUserWatchingVideoUrl(this.video.uuid), + authorizationHeader: this.authService.getRequestHeaderValue() + } : undefined, - if (this.videojsLocaleLoaded === false) { - await loadLocaleInVideoJS(environment.apiUrl, videojs, isOnDevLocale() ? getDevLocale() : this.localeId) - this.videojsLocaleLoaded = true + serverUrl: environment.apiUrl, + + videoCaptions: playerCaptions + }, + + webtorrent: { + videoFiles: this.video.files + } } - const self = this - this.zone.runOutsideAngular(async () => { - videojs(this.playerElement, videojsOptions, function (this: videojs.Player) { - self.player = this - this.on('customError', ({ err }: { err: any }) => self.handleError(err)) + const mode: PlayerMode = urlOptions.playerMode === 'p2p-media-loader' ? 'p2p-media-loader' : 'webtorrent' + + if (mode === 'p2p-media-loader') { + const hlsPlaylist = this.video.getHlsPlaylist() - addContextMenu(self.player, self.video.embedUrl) - }) + const p2pMediaLoader = { + playlistUrl: hlsPlaylist.playlistUrl, + segmentsSha256Url: hlsPlaylist.segmentsSha256Url, + redundancyBaseUrls: hlsPlaylist.redundancies.map(r => r.baseUrl), + trackerAnnounce: this.video.trackerUrls, + videoFiles: this.video.files + } as P2PMediaLoaderOptions + + Object.assign(options, { p2pMediaLoader }) + } + + this.zone.runOutsideAngular(async () => { + this.player = await PeertubePlayerManager.initialize(mode, options) + this.player.on('customError', ({ err }: { err: any }) => this.handleError(err)) }) this.setVideoDescriptionHTML() diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts index 54a12c126..2f448db78 100644 --- a/client/src/app/videos/+video-watch/video-watch.module.ts +++ b/client/src/app/videos/+video-watch/video-watch.module.ts @@ -1,9 +1,7 @@ import { NgModule } from '@angular/core' -import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service' import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component' import { ClipboardModule } from 'ngx-clipboard' import { SharedModule } from '../../shared' -import { MarkdownService } from '../shared' import { VideoCommentAddComponent } from './comment/video-comment-add.component' import { VideoCommentComponent } from './comment/video-comment.component' import { VideoCommentService } from './comment/video-comment.service' @@ -46,8 +44,6 @@ import { RecommendationsModule } from '@app/videos/recommendations/recommendatio ], providers: [ - MarkdownService, - LinkifierService, VideoCommentService ] }) diff --git a/client/src/app/videos/shared/index.ts b/client/src/app/videos/shared/index.ts deleted file mode 100644 index 7a66944b9..000000000 --- a/client/src/app/videos/shared/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './markdown.service' diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index accc5bfe5..6fd74e67a 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -8,7 +8,7 @@ import { VideoSortField } from '../../shared/video/sort-field.type' import { VideoService } from '../../shared/video/video.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { ScreenService } from '@app/shared/misc/screen.service' -import { Notifier } from '@app/core' +import { Notifier, ServerService } from '@app/core' @Component({ selector: 'my-videos-trending', @@ -27,18 +27,33 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, protected authService: AuthService, protected location: Location, protected screenService: ScreenService, + private serverService: ServerService, protected i18n: I18n, private videoService: VideoService ) { super() - - this.titlePage = i18n('Trending') } ngOnInit () { super.ngOnInit() this.generateSyndicationList() + + this.serverService.configLoaded.subscribe( + () => { + const trendingDays = this.serverService.getConfig().trending.videos.intervalDays + + if (trendingDays === 1) { + this.titlePage = this.i18n('Trending for the last 24 hours') + this.titleTooltip = this.i18n('Trending videos are those totalizing the greatest number of views during the last 24 hours.') + } else { + this.titlePage = this.i18n('Trending for the last {{days}} days', { days: trendingDays }) + this.titleTooltip = this.i18n( + 'Trending videos are those totalizing the greatest number of views during the last {{days}} days.', + { days: trendingDays } + ) + } + }) } ngOnDestroy () { diff --git a/client/src/assets/images/global/add.svg b/client/src/assets/images/global/add.html similarity index 72% rename from client/src/assets/images/global/add.svg rename to client/src/assets/images/global/add.html index 42b269c43..bfb0a52bc 100644 --- a/client/src/assets/images/global/add.svg +++ b/client/src/assets/images/global/add.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/alert.svg b/client/src/assets/images/global/alert.html similarity index 71% rename from client/src/assets/images/video/alert.svg rename to client/src/assets/images/global/alert.html index 5b43534ad..7c8c02074 100644 --- a/client/src/assets/images/video/alert.svg +++ b/client/src/assets/images/global/alert.html @@ -1,11 +1,6 @@ - - - alert - Created with Sketch. - - - + + diff --git a/client/src/assets/images/global/circle-tick.html b/client/src/assets/images/global/circle-tick.html new file mode 100644 index 000000000..2327de6be --- /dev/null +++ b/client/src/assets/images/global/circle-tick.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/client/src/assets/images/global/cloud-download.html b/client/src/assets/images/global/cloud-download.html new file mode 100644 index 000000000..b2634fd1f --- /dev/null +++ b/client/src/assets/images/global/cloud-download.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/cloud-error.html b/client/src/assets/images/global/cloud-error.html new file mode 100644 index 000000000..1a3483805 --- /dev/null +++ b/client/src/assets/images/global/cloud-error.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/cog.html b/client/src/assets/images/global/cog.html new file mode 100644 index 000000000..b74a180e7 --- /dev/null +++ b/client/src/assets/images/global/cog.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/client/src/assets/images/global/cross.svg b/client/src/assets/images/global/cross.html similarity index 63% rename from client/src/assets/images/global/cross.svg rename to client/src/assets/images/global/cross.html index d47a75996..962578487 100644 --- a/client/src/assets/images/global/cross.svg +++ b/client/src/assets/images/global/cross.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/global/delete-black.svg b/client/src/assets/images/global/delete-black.svg deleted file mode 100644 index 04ddc23aa..000000000 --- a/client/src/assets/images/global/delete-black.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/client/src/assets/images/global/delete-white.svg b/client/src/assets/images/global/delete-white.svg deleted file mode 100644 index 9c52de557..000000000 --- a/client/src/assets/images/global/delete-white.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/client/src/assets/images/global/delete-grey.svg b/client/src/assets/images/global/delete.html similarity index 71% rename from client/src/assets/images/global/delete-grey.svg rename to client/src/assets/images/global/delete.html index 67e9e2ce7..a0d9a0cac 100644 --- a/client/src/assets/images/global/delete-grey.svg +++ b/client/src/assets/images/global/delete.html @@ -1,13 +1,11 @@ - - - - + + - - - - + + + + diff --git a/client/src/assets/images/video/download-black.svg b/client/src/assets/images/global/download.html similarity index 64% rename from client/src/assets/images/video/download-black.svg rename to client/src/assets/images/global/download.html index 501836746..259506f31 100644 --- a/client/src/assets/images/video/download-black.svg +++ b/client/src/assets/images/global/download.html @@ -1,11 +1,6 @@ - - - download - Created with Sketch. - - - + + diff --git a/client/src/assets/images/global/edit-black.svg b/client/src/assets/images/global/edit-black.svg deleted file mode 100644 index 0176b0f37..000000000 --- a/client/src/assets/images/global/edit-black.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - edit - Created with Sketch. - - - - - - - - - - diff --git a/client/src/assets/images/global/edit-grey.svg b/client/src/assets/images/global/edit.html similarity index 62% rename from client/src/assets/images/global/edit-grey.svg rename to client/src/assets/images/global/edit.html index 23ece68f1..f04183c2d 100644 --- a/client/src/assets/images/global/edit-grey.svg +++ b/client/src/assets/images/global/edit.html @@ -1,11 +1,6 @@ - - - edit - Created with Sketch. - - - + + diff --git a/client/src/assets/images/global/help.svg b/client/src/assets/images/global/help.html similarity index 76% rename from client/src/assets/images/global/help.svg rename to client/src/assets/images/global/help.html index 48252febe..80cd40321 100644 --- a/client/src/assets/images/global/help.svg +++ b/client/src/assets/images/global/help.html @@ -1,12 +1,10 @@ - - - - + + - - + + - \ No newline at end of file + diff --git a/client/src/assets/images/global/im-with-her.svg b/client/src/assets/images/global/im-with-her.html similarity index 70% rename from client/src/assets/images/global/im-with-her.svg rename to client/src/assets/images/global/im-with-her.html index 31d4754fd..de2c62e96 100644 --- a/client/src/assets/images/global/im-with-her.svg +++ b/client/src/assets/images/global/im-with-her.html @@ -1,15 +1,10 @@ - - - im-with-her - Created with Sketch. - - - + + - + - \ No newline at end of file + diff --git a/client/src/assets/images/global/no.html b/client/src/assets/images/global/no.html new file mode 100644 index 000000000..bb7b28514 --- /dev/null +++ b/client/src/assets/images/global/no.html @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/client/src/assets/images/global/sparkle.html b/client/src/assets/images/global/sparkle.html new file mode 100644 index 000000000..3b29fefb9 --- /dev/null +++ b/client/src/assets/images/global/sparkle.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/syndication.svg b/client/src/assets/images/global/syndication.html similarity index 88% rename from client/src/assets/images/global/syndication.svg rename to client/src/assets/images/global/syndication.html index cb74cf81b..e6c88a4db 100644 --- a/client/src/assets/images/global/syndication.svg +++ b/client/src/assets/images/global/syndication.html @@ -1,10 +1,8 @@ - - - - - - + + diff --git a/client/src/assets/images/global/undo.html b/client/src/assets/images/global/undo.html new file mode 100644 index 000000000..228245c86 --- /dev/null +++ b/client/src/assets/images/global/undo.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/client/src/assets/images/global/undo.svg b/client/src/assets/images/global/undo.svg deleted file mode 100644 index f1cca03f7..000000000 --- a/client/src/assets/images/global/undo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/client/src/assets/images/global/user-add.html b/client/src/assets/images/global/user-add.html new file mode 100644 index 000000000..57df23c74 --- /dev/null +++ b/client/src/assets/images/global/user-add.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/validate.svg b/client/src/assets/images/global/validate.html similarity index 69% rename from client/src/assets/images/global/validate.svg rename to client/src/assets/images/global/validate.html index 5c7ee9d14..520624ff6 100644 --- a/client/src/assets/images/global/validate.svg +++ b/client/src/assets/images/global/validate.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/blacklist.svg b/client/src/assets/images/video/blacklist.svg deleted file mode 100644 index 431c73816..000000000 --- a/client/src/assets/images/video/blacklist.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no - Created with Sketch. - - - - - - - - - - diff --git a/client/src/assets/images/video/dislike-white.svg b/client/src/assets/images/video/dislike-white.svg deleted file mode 100644 index cfc6eaa1f..000000000 --- a/client/src/assets/images/video/dislike-white.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/client/src/assets/images/video/dislike-grey.svg b/client/src/assets/images/video/dislike.html similarity index 77% rename from client/src/assets/images/video/dislike-grey.svg rename to client/src/assets/images/video/dislike.html index 56a7908fb..acde951e2 100644 --- a/client/src/assets/images/video/dislike-grey.svg +++ b/client/src/assets/images/video/dislike.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/download-grey.svg b/client/src/assets/images/video/download-grey.svg deleted file mode 100644 index 5b0cca5ef..000000000 --- a/client/src/assets/images/video/download-grey.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - download - Created with Sketch. - - - - - - - - - - - diff --git a/client/src/assets/images/video/download-white.svg b/client/src/assets/images/video/download-white.svg deleted file mode 100644 index 0e66e06e8..000000000 --- a/client/src/assets/images/video/download-white.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - download - Created with Sketch. - - - - - - - - - - - diff --git a/client/src/assets/images/video/heart.svg b/client/src/assets/images/video/heart.html similarity index 66% rename from client/src/assets/images/video/heart.svg rename to client/src/assets/images/video/heart.html index 5d64aee0f..618f64f10 100644 --- a/client/src/assets/images/video/heart.svg +++ b/client/src/assets/images/video/heart.html @@ -1,9 +1,7 @@ - - - - - + + + diff --git a/client/src/assets/images/video/like-white.svg b/client/src/assets/images/video/like-white.svg deleted file mode 100644 index 88e5f6a9a..000000000 --- a/client/src/assets/images/video/like-white.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - thumbs-up - Created with Sketch. - - - - - - - - - - diff --git a/client/src/assets/images/video/like-grey.svg b/client/src/assets/images/video/like.html similarity index 61% rename from client/src/assets/images/video/like-grey.svg rename to client/src/assets/images/video/like.html index 5ef6c7b31..d0e71763b 100644 --- a/client/src/assets/images/video/like-grey.svg +++ b/client/src/assets/images/video/like.html @@ -1,11 +1,6 @@ - - - thumbs-up - Created with Sketch. - - - + + diff --git a/client/src/assets/images/video/more.svg b/client/src/assets/images/video/more.html similarity index 76% rename from client/src/assets/images/video/more.svg rename to client/src/assets/images/video/more.html index dea392136..39dcad10e 100644 --- a/client/src/assets/images/video/more.svg +++ b/client/src/assets/images/video/more.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/share.svg b/client/src/assets/images/video/share.html similarity index 62% rename from client/src/assets/images/video/share.svg rename to client/src/assets/images/video/share.html index da0f43e81..7759b37af 100644 --- a/client/src/assets/images/video/share.svg +++ b/client/src/assets/images/video/share.html @@ -1,11 +1,6 @@ - - - share - Created with Sketch. - - - + + diff --git a/client/src/assets/images/header/upload-white.svg b/client/src/assets/images/video/upload.html similarity index 69% rename from client/src/assets/images/header/upload-white.svg rename to client/src/assets/images/video/upload.html index 2b07caf76..3bc0d3a8a 100644 --- a/client/src/assets/images/header/upload-white.svg +++ b/client/src/assets/images/video/upload.html @@ -1,11 +1,6 @@ - - - cloud-upload - Created with Sketch. - - - + + diff --git a/client/src/assets/images/video/upload.svg b/client/src/assets/images/video/upload.svg deleted file mode 100644 index c5b7cb443..000000000 --- a/client/src/assets/images/video/upload.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - cloud-upload - Created with Sketch. - - - - - - - - - - - diff --git a/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts new file mode 100644 index 000000000..022a9c16f --- /dev/null +++ b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts @@ -0,0 +1,143 @@ +// FIXME: something weird with our path definition in tsconfig and typings +// @ts-ignore +import * as videojs from 'video.js' +import { P2PMediaLoaderPluginOptions, PlayerNetworkInfo, VideoJSComponentInterface } from '../peertube-videojs-typings' +import { Engine, initHlsJsPlayer, initVideoJsContribHlsJsPlayer } from 'p2p-media-loader-hlsjs' +import { Events } from 'p2p-media-loader-core' + +// videojs-hlsjs-plugin needs videojs in window +window['videojs'] = videojs +require('@streamroot/videojs-hlsjs-plugin') + +const Plugin: VideoJSComponentInterface = videojs.getPlugin('plugin') +class P2pMediaLoaderPlugin extends Plugin { + + private readonly CONSTANTS = { + INFO_SCHEDULER: 1000 // Don't change this + } + private readonly options: P2PMediaLoaderPluginOptions + + private hlsjs: any // Don't type hlsjs to not bundle the module + private p2pEngine: Engine + private statsP2PBytes = { + pendingDownload: [] as number[], + pendingUpload: [] as number[], + numPeers: 0, + totalDownload: 0, + totalUpload: 0 + } + private statsHTTPBytes = { + pendingDownload: [] as number[], + pendingUpload: [] as number[], + totalDownload: 0, + totalUpload: 0 + } + + private networkInfoInterval: any + + constructor (player: videojs.Player, options: P2PMediaLoaderPluginOptions) { + super(player, options) + + this.options = options + + videojs.Html5Hlsjs.addHook('beforeinitialize', (videojsPlayer: any, hlsjs: any) => { + this.hlsjs = hlsjs + }) + + initVideoJsContribHlsJsPlayer(player) + + player.src({ + type: options.type, + src: options.src + }) + + player.on('play', () => { + player.addClass('vjs-has-big-play-button-clicked') + }) + + player.ready(() => this.initialize()) + } + + dispose () { + if (this.hlsjs) this.hlsjs.destroy() + if (this.p2pEngine) this.p2pEngine.destroy() + + clearInterval(this.networkInfoInterval) + } + + private initialize () { + initHlsJsPlayer(this.hlsjs) + + const tech = this.player.tech_ + this.p2pEngine = tech.options_.hlsjsConfig.loader.getEngine() + + // Avoid using constants to not import hls.hs + // https://github.com/video-dev/hls.js/blob/master/src/events.js#L37 + this.hlsjs.on('hlsLevelSwitching', (_: any, data: any) => { + this.trigger('resolutionChange', { auto: this.hlsjs.autoLevelEnabled, resolutionId: data.height }) + }) + + this.p2pEngine.on(Events.SegmentError, (segment, err) => { + console.error('Segment error.', segment, err) + }) + + this.statsP2PBytes.numPeers = 1 + this.options.redundancyBaseUrls.length + + this.runStats() + } + + private runStats () { + this.p2pEngine.on(Events.PieceBytesDownloaded, (method: string, size: number) => { + const elem = method === 'p2p' ? this.statsP2PBytes : this.statsHTTPBytes + + elem.pendingDownload.push(size) + elem.totalDownload += size + }) + + this.p2pEngine.on(Events.PieceBytesUploaded, (method: string, size: number) => { + const elem = method === 'p2p' ? this.statsP2PBytes : this.statsHTTPBytes + + elem.pendingUpload.push(size) + elem.totalUpload += size + }) + + this.p2pEngine.on(Events.PeerConnect, () => this.statsP2PBytes.numPeers++) + this.p2pEngine.on(Events.PeerClose, () => this.statsP2PBytes.numPeers--) + + this.networkInfoInterval = setInterval(() => { + const p2pDownloadSpeed = this.arraySum(this.statsP2PBytes.pendingDownload) + const p2pUploadSpeed = this.arraySum(this.statsP2PBytes.pendingUpload) + + const httpDownloadSpeed = this.arraySum(this.statsHTTPBytes.pendingDownload) + const httpUploadSpeed = this.arraySum(this.statsHTTPBytes.pendingUpload) + + this.statsP2PBytes.pendingDownload = [] + this.statsP2PBytes.pendingUpload = [] + this.statsHTTPBytes.pendingDownload = [] + this.statsHTTPBytes.pendingUpload = [] + + return this.player.trigger('p2pInfo', { + http: { + downloadSpeed: httpDownloadSpeed, + uploadSpeed: httpUploadSpeed, + downloaded: this.statsHTTPBytes.totalDownload, + uploaded: this.statsHTTPBytes.totalUpload + }, + p2p: { + downloadSpeed: p2pDownloadSpeed, + uploadSpeed: p2pUploadSpeed, + numPeers: this.statsP2PBytes.numPeers, + downloaded: this.statsP2PBytes.totalDownload, + uploaded: this.statsP2PBytes.totalUpload + } + } as PlayerNetworkInfo) + }, this.CONSTANTS.INFO_SCHEDULER) + } + + private arraySum (data: number[]) { + return data.reduce((a: number, b: number) => a + b, 0) + } +} + +videojs.registerPlugin('p2pMediaLoader', P2pMediaLoaderPlugin) +export { P2pMediaLoaderPlugin } diff --git a/client/src/assets/player/p2p-media-loader/segment-url-builder.ts b/client/src/assets/player/p2p-media-loader/segment-url-builder.ts new file mode 100644 index 000000000..32e7ce4f2 --- /dev/null +++ b/client/src/assets/player/p2p-media-loader/segment-url-builder.ts @@ -0,0 +1,28 @@ +import { basename } from 'path' +import { Segment } from 'p2p-media-loader-core' + +function segmentUrlBuilderFactory (baseUrls: string[]) { + return function segmentBuilder (segment: Segment) { + const max = baseUrls.length + 1 + const i = getRandomInt(max) + + if (i === max - 1) return segment.url + + let newBaseUrl = baseUrls[i] + let middlePart = newBaseUrl.endsWith('/') ? '' : '/' + + return newBaseUrl + middlePart + basename(segment.url) + } +} + +// --------------------------------------------------------------------------- + +export { + segmentUrlBuilderFactory +} + +// --------------------------------------------------------------------------- + +function getRandomInt (max: number) { + return Math.floor(Math.random() * Math.floor(max)) +} diff --git a/client/src/assets/player/p2p-media-loader/segment-validator.ts b/client/src/assets/player/p2p-media-loader/segment-validator.ts new file mode 100644 index 000000000..72c32f9e0 --- /dev/null +++ b/client/src/assets/player/p2p-media-loader/segment-validator.ts @@ -0,0 +1,63 @@ +import { Segment } from 'p2p-media-loader-core' +import { basename } from 'path' + +function segmentValidatorFactory (segmentsSha256Url: string) { + const segmentsJSON = fetchSha256Segments(segmentsSha256Url) + const regex = /bytes=(\d+)-(\d+)/ + + return async function segmentValidator (segment: Segment) { + const filename = basename(segment.url) + const captured = regex.exec(segment.range) + + const range = captured[1] + '-' + captured[2] + + const hashShouldBe = (await segmentsJSON)[filename][range] + if (hashShouldBe === undefined) { + throw new Error(`Unknown segment name ${filename}/${range} in segment validator`) + } + + const calculatedSha = bufferToEx(await sha256(segment.data)) + if (calculatedSha !== hashShouldBe) { + throw new Error( + `Hashes does not correspond for segment ${filename}/${range}` + + `(expected: ${hashShouldBe} instead of ${calculatedSha})` + ) + } + } +} + +// --------------------------------------------------------------------------- + +export { + segmentValidatorFactory +} + +// --------------------------------------------------------------------------- + +function fetchSha256Segments (url: string) { + return fetch(url) + .then(res => res.json()) + .catch(err => { + console.error('Cannot get sha256 segments', err) + return {} + }) +} + +function sha256 (data?: ArrayBuffer) { + if (!data) return undefined + + return window.crypto.subtle.digest('SHA-256', data) +} + +// Thanks: https://stackoverflow.com/a/53307879 +function bufferToEx (buffer?: ArrayBuffer) { + if (!buffer) return '' + + let s = '' + const h = '0123456789abcdef' + const o = new Uint8Array(buffer) + + o.forEach((v: any) => s += h[ v >> 4 ] + h[ v & 15 ]) + + return s +} diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts new file mode 100644 index 000000000..0ba9bcb11 --- /dev/null +++ b/client/src/assets/player/peertube-player-manager.ts @@ -0,0 +1,466 @@ +import { VideoFile } from '../../../../shared/models/videos' +// @ts-ignore +import * as videojs from 'video.js' +import 'videojs-hotkeys' +import 'videojs-dock' +import 'videojs-contextmenu-ui' +import 'videojs-contrib-quality-levels' +import './peertube-plugin' +import './videojs-components/peertube-link-button' +import './videojs-components/resolution-menu-button' +import './videojs-components/settings-menu-button' +import './videojs-components/p2p-info-button' +import './videojs-components/peertube-load-progress-bar' +import './videojs-components/theater-button' +import { P2PMediaLoaderPluginOptions, UserWatching, VideoJSCaption, VideoJSPluginOptions, videojsUntyped } from './peertube-videojs-typings' +import { buildVideoEmbed, buildVideoLink, copyToClipboard, getRtcConfig } from './utils' +import { getCompleteLocale, getShortLocale, is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n' +import { segmentValidatorFactory } from './p2p-media-loader/segment-validator' +import { segmentUrlBuilderFactory } from './p2p-media-loader/segment-url-builder' + +// Change 'Playback Rate' to 'Speed' (smaller for our settings menu) +videojsUntyped.getComponent('PlaybackRateMenuButton').prototype.controlText_ = 'Speed' +// Change Captions to Subtitles/CC +videojsUntyped.getComponent('CaptionsButton').prototype.controlText_ = 'Subtitles/CC' +// We just want to display 'Off' instead of 'captions off', keep a space so the variable == true (hacky I know) +videojsUntyped.getComponent('CaptionsButton').prototype.label_ = ' ' + +export type PlayerMode = 'webtorrent' | 'p2p-media-loader' + +export type WebtorrentOptions = { + videoFiles: VideoFile[] +} + +export type P2PMediaLoaderOptions = { + playlistUrl: string + segmentsSha256Url: string + trackerAnnounce: string[] + redundancyBaseUrls: string[] + videoFiles: VideoFile[] +} + +export type CommonOptions = { + playerElement: HTMLVideoElement + onPlayerElementChange: (element: HTMLVideoElement) => void + + autoplay: boolean + videoDuration: number + enableHotkeys: boolean + inactivityTimeout: number + poster: string + startTime: number | string + + theaterMode: boolean + captions: boolean + peertubeLink: boolean + + videoViewUrl: string + embedUrl: string + + language?: string + controls?: boolean + muted?: boolean + loop?: boolean + subtitle?: string + + videoCaptions: VideoJSCaption[] + + userWatching?: UserWatching + + serverUrl: string +} + +export type PeertubePlayerManagerOptions = { + common: CommonOptions, + webtorrent: WebtorrentOptions, + p2pMediaLoader?: P2PMediaLoaderOptions +} + +export class PeertubePlayerManager { + + private static videojsLocaleCache: { [ path: string ]: any } = {} + private static playerElementClassName: string + + static getServerTranslations (serverUrl: string, locale: string) { + const path = PeertubePlayerManager.getLocalePath(serverUrl, locale) + // It is the default locale, nothing to translate + if (!path) return Promise.resolve(undefined) + + return fetch(path + '/server.json') + .then(res => res.json()) + .catch(err => { + console.error('Cannot get server translations', err) + return undefined + }) + } + + static async initialize (mode: PlayerMode, options: PeertubePlayerManagerOptions) { + let p2pMediaLoader: any + + this.playerElementClassName = options.common.playerElement.className + + if (mode === 'webtorrent') await import('./webtorrent/webtorrent-plugin') + if (mode === 'p2p-media-loader') { + [ p2pMediaLoader ] = await Promise.all([ + import('p2p-media-loader-hlsjs'), + import('./p2p-media-loader/p2p-media-loader-plugin') + ]) + } + + const videojsOptions = this.getVideojsOptions(mode, options, p2pMediaLoader) + + await this.loadLocaleInVideoJS(options.common.serverUrl, options.common.language) + + const self = this + return new Promise(res => { + videojs(options.common.playerElement, videojsOptions, function (this: any) { + const player = this + + player.tech_.on('error', () => { + // Fallback to webtorrent? + if (mode === 'p2p-media-loader') { + self.fallbackToWebTorrent(player, options) + } + }) + + self.addContextMenu(mode, player, options.common.embedUrl) + + return res(player) + }) + }) + } + + private static async fallbackToWebTorrent (player: any, options: PeertubePlayerManagerOptions) { + const newVideoElement = document.createElement('video') + newVideoElement.className = this.playerElementClassName + + // VideoJS wraps our video element inside a div + const currentParentPlayerElement = options.common.playerElement.parentNode + currentParentPlayerElement.parentNode.insertBefore(newVideoElement, currentParentPlayerElement) + + options.common.playerElement = newVideoElement + options.common.onPlayerElementChange(newVideoElement) + + player.dispose() + + await import('./webtorrent/webtorrent-plugin') + + const mode = 'webtorrent' + const videojsOptions = this.getVideojsOptions(mode, options) + + const self = this + videojs(newVideoElement, videojsOptions, function (this: any) { + const player = this + + self.addContextMenu(mode, player, options.common.embedUrl) + }) + } + + private static loadLocaleInVideoJS (serverUrl: string, locale: string) { + const path = PeertubePlayerManager.getLocalePath(serverUrl, locale) + // It is the default locale, nothing to translate + if (!path) return Promise.resolve(undefined) + + let p: Promise + + if (PeertubePlayerManager.videojsLocaleCache[path]) { + p = Promise.resolve(PeertubePlayerManager.videojsLocaleCache[path]) + } else { + p = fetch(path + '/player.json') + .then(res => res.json()) + .then(json => { + PeertubePlayerManager.videojsLocaleCache[path] = json + return json + }) + .catch(err => { + console.error('Cannot get player translations', err) + return undefined + }) + } + + const completeLocale = getCompleteLocale(locale) + return p.then(json => videojs.addLanguage(getShortLocale(completeLocale), json)) + } + + private static getVideojsOptions (mode: PlayerMode, options: PeertubePlayerManagerOptions, p2pMediaLoaderModule?: any) { + const commonOptions = options.common + const webtorrentOptions = options.webtorrent + const p2pMediaLoaderOptions = options.p2pMediaLoader + + let autoplay = options.common.autoplay + let html5 = {} + + const plugins: VideoJSPluginOptions = { + peertube: { + mode, + autoplay, // Use peertube plugin autoplay because we get the file by webtorrent + videoViewUrl: commonOptions.videoViewUrl, + videoDuration: commonOptions.videoDuration, + startTime: commonOptions.startTime, + userWatching: commonOptions.userWatching, + subtitle: commonOptions.subtitle, + videoCaptions: commonOptions.videoCaptions + } + } + + if (mode === 'p2p-media-loader') { + const p2pMediaLoader: P2PMediaLoaderPluginOptions = { + redundancyBaseUrls: options.p2pMediaLoader.redundancyBaseUrls, + type: 'application/x-mpegURL', + src: p2pMediaLoaderOptions.playlistUrl + } + + const trackerAnnounce = p2pMediaLoaderOptions.trackerAnnounce + .filter(t => t.startsWith('ws')) + + const p2pMediaLoaderConfig = { + loader: { + trackerAnnounce, + segmentValidator: segmentValidatorFactory(options.p2pMediaLoader.segmentsSha256Url), + rtcConfig: getRtcConfig(), + requiredSegmentsPriority: 5, + segmentUrlBuilder: segmentUrlBuilderFactory(options.p2pMediaLoader.redundancyBaseUrls) + }, + segments: { + swarmId: p2pMediaLoaderOptions.playlistUrl + } + } + const streamrootHls = { + levelLabelHandler: (level: { height: number, width: number }) => { + const file = p2pMediaLoaderOptions.videoFiles.find(f => f.resolution.id === level.height) + + let label = file.resolution.label + if (file.fps >= 50) label += file.fps + + return label + }, + html5: { + hlsjsConfig: { + liveSyncDurationCount: 7, + loader: new p2pMediaLoaderModule.Engine(p2pMediaLoaderConfig).createLoaderClass() + } + } + } + + Object.assign(plugins, { p2pMediaLoader, streamrootHls }) + html5 = streamrootHls.html5 + } + + if (mode === 'webtorrent') { + const webtorrent = { + autoplay, + videoDuration: commonOptions.videoDuration, + playerElement: commonOptions.playerElement, + videoFiles: webtorrentOptions.videoFiles + } + Object.assign(plugins, { webtorrent }) + + // WebTorrent plugin handles autoplay, because we do some hackish stuff in there + autoplay = false + } + + const videojsOptions = { + html5, + + // We don't use text track settings for now + textTrackSettings: false, + controls: commonOptions.controls !== undefined ? commonOptions.controls : true, + loop: commonOptions.loop !== undefined ? commonOptions.loop : false, + + muted: commonOptions.muted !== undefined + ? commonOptions.muted + : undefined, // Undefined so the player knows it has to check the local storage + + poster: commonOptions.poster, + autoplay: autoplay === true ? 'any' : autoplay, // Use 'any' instead of true to get notifier by videojs if autoplay fails + inactivityTimeout: commonOptions.inactivityTimeout, + playbackRates: [ 0.5, 0.75, 1, 1.25, 1.5, 2 ], + plugins, + controlBar: { + children: this.getControlBarChildren(mode, { + captions: commonOptions.captions, + peertubeLink: commonOptions.peertubeLink, + theaterMode: commonOptions.theaterMode + }) + } + } + + if (commonOptions.enableHotkeys === true) { + Object.assign(videojsOptions.plugins, { + hotkeys: { + enableVolumeScroll: false, + enableModifiersForNumbers: false, + + fullscreenKey: function (event: KeyboardEvent) { + // fullscreen with the f key or Ctrl+Enter + return event.key === 'f' || (event.ctrlKey && event.key === 'Enter') + }, + + seekStep: function (event: KeyboardEvent) { + // mimic VLC seek behavior, and default to 5 (original value is 5). + if (event.ctrlKey && event.altKey) { + return 5 * 60 + } else if (event.ctrlKey) { + return 60 + } else if (event.altKey) { + return 10 + } else { + return 5 + } + }, + + customKeys: { + increasePlaybackRateKey: { + key: function (event: KeyboardEvent) { + return event.key === '>' + }, + handler: function (player: videojs.Player) { + player.playbackRate((player.playbackRate() + 0.1).toFixed(2)) + } + }, + decreasePlaybackRateKey: { + key: function (event: KeyboardEvent) { + return event.key === '<' + }, + handler: function (player: videojs.Player) { + player.playbackRate((player.playbackRate() - 0.1).toFixed(2)) + } + }, + frameByFrame: { + key: function (event: KeyboardEvent) { + return event.key === '.' + }, + handler: function (player: videojs.Player) { + player.pause() + // Calculate movement distance (assuming 30 fps) + const dist = 1 / 30 + player.currentTime(player.currentTime() + dist) + } + } + } + } + }) + } + + if (commonOptions.language && !isDefaultLocale(commonOptions.language)) { + Object.assign(videojsOptions, { language: commonOptions.language }) + } + + return videojsOptions + } + + private static getControlBarChildren (mode: PlayerMode, options: { + peertubeLink: boolean + theaterMode: boolean, + captions: boolean + }) { + const settingEntries = [] + const loadProgressBar = mode === 'webtorrent' ? 'peerTubeLoadProgressBar' : 'loadProgressBar' + + // Keep an order + settingEntries.push('playbackRateMenuButton') + if (options.captions === true) settingEntries.push('captionsButton') + settingEntries.push('resolutionMenuButton') + + const children = { + 'playToggle': {}, + 'currentTimeDisplay': {}, + 'timeDivider': {}, + 'durationDisplay': {}, + 'liveDisplay': {}, + + 'flexibleWidthSpacer': {}, + 'progressControl': { + children: { + 'seekBar': { + children: { + [loadProgressBar]: {}, + 'mouseTimeDisplay': {}, + 'playProgressBar': {} + } + } + } + }, + + 'p2PInfoButton': {}, + + 'muteToggle': {}, + 'volumeControl': {}, + + 'settingsButton': { + setup: { + maxHeightOffset: 40 + }, + entries: settingEntries + } + } + + if (options.peertubeLink === true) { + Object.assign(children, { + 'peerTubeLinkButton': {} + }) + } + + if (options.theaterMode === true) { + Object.assign(children, { + 'theaterButton': {} + }) + } + + Object.assign(children, { + 'fullscreenToggle': {} + }) + + return children + } + + private static addContextMenu (mode: PlayerMode, player: any, videoEmbedUrl: string) { + const content = [ + { + label: player.localize('Copy the video URL'), + listener: function () { + copyToClipboard(buildVideoLink()) + } + }, + { + label: player.localize('Copy the video URL at the current time'), + listener: function () { + const player = this as videojs.Player + copyToClipboard(buildVideoLink(player.currentTime())) + } + }, + { + label: player.localize('Copy embed code'), + listener: () => { + copyToClipboard(buildVideoEmbed(videoEmbedUrl)) + } + } + ] + + if (mode === 'webtorrent') { + content.push({ + label: player.localize('Copy magnet URI'), + listener: function () { + const player = this as videojs.Player + copyToClipboard(player.webtorrent().getCurrentVideoFile().magnetUri) + } + }) + } + + player.contextmenuUI({ content }) + } + + private static getLocalePath (serverUrl: string, locale: string) { + const completeLocale = getCompleteLocale(locale) + + if (!is18nLocale(completeLocale) || isDefaultLocale(completeLocale)) return undefined + + return serverUrl + '/client/locales/' + completeLocale + } +} + +// ############################################################################ + +export { + videojs +} diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts deleted file mode 100644 index e0e063838..000000000 --- a/client/src/assets/player/peertube-player.ts +++ /dev/null @@ -1,292 +0,0 @@ -import { VideoFile } from '../../../../shared/models/videos' - -import 'videojs-hotkeys' -import 'videojs-dock' -import 'videojs-contextmenu-ui' -import './peertube-link-button' -import './resolution-menu-button' -import './settings-menu-button' -import './webtorrent-info-button' -import './peertube-videojs-plugin' -import './peertube-load-progress-bar' -import './theater-button' -import { UserWatching, VideoJSCaption, videojsUntyped } from './peertube-videojs-typings' -import { buildVideoEmbed, buildVideoLink, copyToClipboard } from './utils' -import { getCompleteLocale, getShortLocale, is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n' - -// FIXME: something weird with our path definition in tsconfig and typings -// @ts-ignore -import { Player } from 'video.js' - -// Change 'Playback Rate' to 'Speed' (smaller for our settings menu) -videojsUntyped.getComponent('PlaybackRateMenuButton').prototype.controlText_ = 'Speed' -// Change Captions to Subtitles/CC -videojsUntyped.getComponent('CaptionsButton').prototype.controlText_ = 'Subtitles/CC' -// We just want to display 'Off' instead of 'captions off', keep a space so the variable == true (hacky I know) -videojsUntyped.getComponent('CaptionsButton').prototype.label_ = ' ' - -function getVideojsOptions (options: { - autoplay: boolean - playerElement: HTMLVideoElement - videoViewUrl: string - videoDuration: number - videoFiles: VideoFile[] - enableHotkeys: boolean - inactivityTimeout: number - peertubeLink: boolean - poster: string - startTime: number | string - theaterMode: boolean - videoCaptions: VideoJSCaption[] - - language?: string - controls?: boolean - muted?: boolean - loop?: boolean - subtitle?: string - - userWatching?: UserWatching -}) { - const videojsOptions = { - // We don't use text track settings for now - textTrackSettings: false, - controls: options.controls !== undefined ? options.controls : true, - loop: options.loop !== undefined ? options.loop : false, - - muted: options.muted !== undefined ? options.muted : undefined, // Undefined so the player knows it has to check the local storage - - poster: options.poster, - autoplay: false, - inactivityTimeout: options.inactivityTimeout, - playbackRates: [ 0.5, 0.75, 1, 1.25, 1.5, 2 ], - plugins: { - peertube: { - autoplay: options.autoplay, // Use peertube plugin autoplay because we get the file by webtorrent - videoCaptions: options.videoCaptions, - videoFiles: options.videoFiles, - playerElement: options.playerElement, - videoViewUrl: options.videoViewUrl, - videoDuration: options.videoDuration, - startTime: options.startTime, - userWatching: options.userWatching, - subtitle: options.subtitle - } - }, - controlBar: { - children: getControlBarChildren(options) - } - } - - if (options.enableHotkeys === true) { - Object.assign(videojsOptions.plugins, { - hotkeys: { - enableVolumeScroll: false, - enableModifiersForNumbers: false, - - fullscreenKey: function (event: KeyboardEvent) { - // fullscreen with the f key or Ctrl+Enter - return event.key === 'f' || (event.ctrlKey && event.key === 'Enter') - }, - - seekStep: function (event: KeyboardEvent) { - // mimic VLC seek behavior, and default to 5 (original value is 5). - if (event.ctrlKey && event.altKey) { - return 5 * 60 - } else if (event.ctrlKey) { - return 60 - } else if (event.altKey) { - return 10 - } else { - return 5 - } - }, - - customKeys: { - increasePlaybackRateKey: { - key: function (event: KeyboardEvent) { - return event.key === '>' - }, - handler: function (player: Player) { - player.playbackRate((player.playbackRate() + 0.1).toFixed(2)) - } - }, - decreasePlaybackRateKey: { - key: function (event: KeyboardEvent) { - return event.key === '<' - }, - handler: function (player: Player) { - player.playbackRate((player.playbackRate() - 0.1).toFixed(2)) - } - }, - frameByFrame: { - key: function (event: KeyboardEvent) { - return event.key === '.' - }, - handler: function (player: Player) { - player.pause() - // Calculate movement distance (assuming 30 fps) - const dist = 1 / 30 - player.currentTime(player.currentTime() + dist) - } - } - } - } - }) - } - - if (options.language && !isDefaultLocale(options.language)) { - Object.assign(videojsOptions, { language: options.language }) - } - - return videojsOptions -} - -function getControlBarChildren (options: { - peertubeLink: boolean - theaterMode: boolean, - videoCaptions: VideoJSCaption[] -}) { - const settingEntries = [] - - // Keep an order - settingEntries.push('playbackRateMenuButton') - if (options.videoCaptions.length !== 0) settingEntries.push('captionsButton') - settingEntries.push('resolutionMenuButton') - - const children = { - 'playToggle': {}, - 'currentTimeDisplay': {}, - 'timeDivider': {}, - 'durationDisplay': {}, - 'liveDisplay': {}, - - 'flexibleWidthSpacer': {}, - 'progressControl': { - children: { - 'seekBar': { - children: { - 'peerTubeLoadProgressBar': {}, - 'mouseTimeDisplay': {}, - 'playProgressBar': {} - } - } - } - }, - - 'webTorrentButton': {}, - - 'muteToggle': {}, - 'volumeControl': {}, - - 'settingsButton': { - setup: { - maxHeightOffset: 40 - }, - entries: settingEntries - } - } - - if (options.peertubeLink === true) { - Object.assign(children, { - 'peerTubeLinkButton': {} - }) - } - - if (options.theaterMode === true) { - Object.assign(children, { - 'theaterButton': {} - }) - } - - Object.assign(children, { - 'fullscreenToggle': {} - }) - - return children -} - -function addContextMenu (player: any, videoEmbedUrl: string) { - player.contextmenuUI({ - content: [ - { - label: player.localize('Copy the video URL'), - listener: function () { - copyToClipboard(buildVideoLink()) - } - }, - { - label: player.localize('Copy the video URL at the current time'), - listener: function () { - const player = this as Player - copyToClipboard(buildVideoLink(player.currentTime())) - } - }, - { - label: player.localize('Copy embed code'), - listener: () => { - copyToClipboard(buildVideoEmbed(videoEmbedUrl)) - } - }, - { - label: player.localize('Copy magnet URI'), - listener: function () { - const player = this as Player - copyToClipboard(player.peertube().getCurrentVideoFile().magnetUri) - } - } - ] - }) -} - -function loadLocaleInVideoJS (serverUrl: string, videojs: any, locale: string) { - const path = getLocalePath(serverUrl, locale) - // It is the default locale, nothing to translate - if (!path) return Promise.resolve(undefined) - - let p: Promise - - if (loadLocaleInVideoJS.cache[path]) { - p = Promise.resolve(loadLocaleInVideoJS.cache[path]) - } else { - p = fetch(path + '/player.json') - .then(res => res.json()) - .then(json => { - loadLocaleInVideoJS.cache[path] = json - return json - }) - } - - const completeLocale = getCompleteLocale(locale) - return p.then(json => videojs.addLanguage(getShortLocale(completeLocale), json)) -} -namespace loadLocaleInVideoJS { - export const cache: { [ path: string ]: any } = {} -} - -function getServerTranslations (serverUrl: string, locale: string) { - const path = getLocalePath(serverUrl, locale) - // It is the default locale, nothing to translate - if (!path) return Promise.resolve(undefined) - - return fetch(path + '/server.json') - .then(res => res.json()) -} - -// ############################################################################ - -export { - getServerTranslations, - loadLocaleInVideoJS, - getVideojsOptions, - addContextMenu -} - -// ############################################################################ - -function getLocalePath (serverUrl: string, locale: string) { - const completeLocale = getCompleteLocale(locale) - - if (!is18nLocale(completeLocale) || isDefaultLocale(completeLocale)) return undefined - - return serverUrl + '/client/locales/' + completeLocale -} diff --git a/client/src/assets/player/peertube-plugin.ts b/client/src/assets/player/peertube-plugin.ts new file mode 100644 index 000000000..7ea4a06d4 --- /dev/null +++ b/client/src/assets/player/peertube-plugin.ts @@ -0,0 +1,262 @@ +// FIXME: something weird with our path definition in tsconfig and typings +// @ts-ignore +import * as videojs from 'video.js' +import './videojs-components/settings-menu-button' +import { + PeerTubePluginOptions, + ResolutionUpdateData, + UserWatching, + VideoJSCaption, + VideoJSComponentInterface, + videojsUntyped +} from './peertube-videojs-typings' +import { isMobile, timeToInt } from './utils' +import { + getStoredLastSubtitle, + getStoredMute, + getStoredVolume, + saveLastSubtitle, + saveMuteInStore, + saveVolumeInStore +} from './peertube-player-local-storage' + +const Plugin: VideoJSComponentInterface = videojs.getPlugin('plugin') +class PeerTubePlugin extends Plugin { + private readonly autoplay: boolean = false + private readonly startTime: number = 0 + private readonly videoViewUrl: string + private readonly videoDuration: number + private readonly CONSTANTS = { + USER_WATCHING_VIDEO_INTERVAL: 5000 // Every 5 seconds, notify the user is watching the video + } + + private player: any + private videoCaptions: VideoJSCaption[] + private defaultSubtitle: string + + private videoViewInterval: any + private userWatchingVideoInterval: any + private qualityObservationTimer: any + private lastResolutionChange: ResolutionUpdateData + + constructor (player: videojs.Player, options: PeerTubePluginOptions) { + super(player, options) + + this.startTime = timeToInt(options.startTime) + this.videoViewUrl = options.videoViewUrl + this.videoDuration = options.videoDuration + this.videoCaptions = options.videoCaptions + + if (options.autoplay === true) this.player.addClass('vjs-has-autoplay') + + this.player.on('autoplay-failure', () => { + this.player.removeClass('vjs-has-autoplay') + }) + + this.player.ready(() => { + const playerOptions = this.player.options_ + + if (options.mode === 'webtorrent') { + this.player.webtorrent().on('resolutionChange', (_: any, d: any) => this.handleResolutionChange(d)) + this.player.webtorrent().on('autoResolutionChange', (_: any, d: any) => this.trigger('autoResolutionChange', d)) + } + + if (options.mode === 'p2p-media-loader') { + this.player.p2pMediaLoader().on('resolutionChange', (_: any, d: any) => this.handleResolutionChange(d)) + } + + this.player.tech_.on('loadedqualitydata', () => { + setTimeout(() => { + // Replay a resolution change, now we loaded all quality data + if (this.lastResolutionChange) this.handleResolutionChange(this.lastResolutionChange) + }, 0) + }) + + const volume = getStoredVolume() + if (volume !== undefined) this.player.volume(volume) + + const muted = playerOptions.muted !== undefined ? playerOptions.muted : getStoredMute() + if (muted !== undefined) this.player.muted(muted) + + this.defaultSubtitle = options.subtitle || getStoredLastSubtitle() + + this.player.on('volumechange', () => { + saveVolumeInStore(this.player.volume()) + saveMuteInStore(this.player.muted()) + }) + + this.player.textTracks().on('change', () => { + const showing = this.player.textTracks().tracks_.find((t: { kind: string, mode: string }) => { + return t.kind === 'captions' && t.mode === 'showing' + }) + + if (!showing) { + saveLastSubtitle('off') + return + } + + saveLastSubtitle(showing.language) + }) + + this.player.on('sourcechange', () => this.initCaptions()) + + this.player.duration(options.videoDuration) + + this.initializePlayer() + this.runViewAdd() + + if (options.userWatching) this.runUserWatchVideo(options.userWatching) + }) + } + + dispose () { + clearTimeout(this.qualityObservationTimer) + + clearInterval(this.videoViewInterval) + + if (this.userWatchingVideoInterval) clearInterval(this.userWatchingVideoInterval) + } + + private initializePlayer () { + if (isMobile()) this.player.addClass('vjs-is-mobile') + + this.initSmoothProgressBar() + + this.initCaptions() + + this.alterInactivity() + } + + private runViewAdd () { + this.clearVideoViewInterval() + + // After 30 seconds (or 3/4 of the video), add a view to the video + let minSecondsToView = 30 + + if (this.videoDuration < minSecondsToView) minSecondsToView = (this.videoDuration * 3) / 4 + + let secondsViewed = 0 + this.videoViewInterval = setInterval(() => { + if (this.player && !this.player.paused()) { + secondsViewed += 1 + + if (secondsViewed > minSecondsToView) { + this.clearVideoViewInterval() + + this.addViewToVideo().catch(err => console.error(err)) + } + } + }, 1000) + } + + private runUserWatchVideo (options: UserWatching) { + let lastCurrentTime = 0 + + this.userWatchingVideoInterval = setInterval(() => { + const currentTime = Math.floor(this.player.currentTime()) + + if (currentTime - lastCurrentTime >= 1) { + lastCurrentTime = currentTime + + this.notifyUserIsWatching(currentTime, options.url, options.authorizationHeader) + .catch(err => console.error('Cannot notify user is watching.', err)) + } + }, this.CONSTANTS.USER_WATCHING_VIDEO_INTERVAL) + } + + private clearVideoViewInterval () { + if (this.videoViewInterval !== undefined) { + clearInterval(this.videoViewInterval) + this.videoViewInterval = undefined + } + } + + private addViewToVideo () { + if (!this.videoViewUrl) return Promise.resolve(undefined) + + return fetch(this.videoViewUrl, { method: 'POST' }) + } + + private notifyUserIsWatching (currentTime: number, url: string, authorizationHeader: string) { + const body = new URLSearchParams() + body.append('currentTime', currentTime.toString()) + + const headers = new Headers({ 'Authorization': authorizationHeader }) + + return fetch(url, { method: 'PUT', body, headers }) + } + + private handleResolutionChange (data: ResolutionUpdateData) { + this.lastResolutionChange = data + + const qualityLevels = this.player.qualityLevels() + + for (let i = 0; i < qualityLevels.length; i++) { + if (qualityLevels[i].height === data.resolutionId) { + data.id = qualityLevels[i].id + break + } + } + + this.trigger('resolutionChange', data) + } + + private alterInactivity () { + let saveInactivityTimeout: number + + const disableInactivity = () => { + saveInactivityTimeout = this.player.options_.inactivityTimeout + this.player.options_.inactivityTimeout = 0 + } + const enableInactivity = () => { + this.player.options_.inactivityTimeout = saveInactivityTimeout + } + + const settingsDialog = this.player.children_.find((c: any) => c.name_ === 'SettingsDialog') + + this.player.controlBar.on('mouseenter', () => disableInactivity()) + settingsDialog.on('mouseenter', () => disableInactivity()) + this.player.controlBar.on('mouseleave', () => enableInactivity()) + settingsDialog.on('mouseleave', () => enableInactivity()) + } + + private initCaptions () { + for (const caption of this.videoCaptions) { + this.player.addRemoteTextTrack({ + kind: 'captions', + label: caption.label, + language: caption.language, + id: caption.language, + src: caption.src, + default: this.defaultSubtitle === caption.language + }, false) + } + + this.player.trigger('captionsChanged') + } + + // Thanks: https://github.com/videojs/video.js/issues/4460#issuecomment-312861657 + private initSmoothProgressBar () { + const SeekBar = videojsUntyped.getComponent('SeekBar') + SeekBar.prototype.getPercent = function getPercent () { + // Allows for smooth scrubbing, when player can't keep up. + // const time = (this.player_.scrubbing()) ? + // this.player_.getCache().currentTime : + // this.player_.currentTime() + const time = this.player_.currentTime() + const percent = time / this.player_.duration() + return percent >= 1 ? 1 : percent + } + SeekBar.prototype.handleMouseMove = function handleMouseMove (event: any) { + let newTime = this.calculateDistance(event) * this.player_.duration() + if (newTime === this.player_.duration()) { + newTime = newTime - 0.1 + } + this.player_.currentTime(newTime) + this.update() + } + } +} + +videojs.registerPlugin('peertube', PeerTubePlugin) +export { PeerTubePlugin } diff --git a/client/src/assets/player/peertube-videojs-typings.ts b/client/src/assets/player/peertube-videojs-typings.ts index 634c7fdc9..79a5a6c4d 100644 --- a/client/src/assets/player/peertube-videojs-typings.ts +++ b/client/src/assets/player/peertube-videojs-typings.ts @@ -3,11 +3,16 @@ import * as videojs from 'video.js' import { VideoFile } from '../../../../shared/models/videos/video.model' -import { PeerTubePlugin } from './peertube-videojs-plugin' +import { PeerTubePlugin } from './peertube-plugin' +import { WebTorrentPlugin } from './webtorrent/webtorrent-plugin' +import { P2pMediaLoaderPlugin } from './p2p-media-loader/p2p-media-loader-plugin' +import { PlayerMode } from './peertube-player-manager' declare namespace videojs { interface Player { peertube (): PeerTubePlugin + webtorrent (): WebTorrentPlugin + p2pMediaLoader (): P2pMediaLoaderPlugin } } @@ -30,26 +35,95 @@ type UserWatching = { authorizationHeader: string } -type PeertubePluginOptions = { - videoFiles: VideoFile[] - playerElement: HTMLVideoElement +type PeerTubePluginOptions = { + mode: PlayerMode + + autoplay: boolean videoViewUrl: string videoDuration: number startTime: number | string - autoplay: boolean, - videoCaptions: VideoJSCaption[] - subtitle?: string userWatching?: UserWatching + subtitle?: string + + videoCaptions: VideoJSCaption[] +} + +type WebtorrentPluginOptions = { + playerElement: HTMLVideoElement + + autoplay: boolean + videoDuration: number + + videoFiles: VideoFile[] +} + +type P2PMediaLoaderPluginOptions = { + redundancyBaseUrls: string[] + type: string + src: string +} + +type VideoJSPluginOptions = { + peertube: PeerTubePluginOptions + + webtorrent?: WebtorrentPluginOptions + + p2pMediaLoader?: P2PMediaLoaderPluginOptions } // videojs typings don't have some method we need const videojsUntyped = videojs as any +type LoadedQualityData = { + qualitySwitchCallback: Function, + qualityData: { + video: { + id: number + label: string + selected: boolean + }[] + } +} + +type ResolutionUpdateData = { + auto: boolean, + resolutionId: number + id?: number +} + +type AutoResolutionUpdateData = { + possible: boolean +} + +type PlayerNetworkInfo = { + http: { + downloadSpeed: number + uploadSpeed: number + downloaded: number + uploaded: number + } + + p2p: { + downloadSpeed: number + uploadSpeed: number + downloaded: number + uploaded: number + numPeers: number + } +} + export { + PlayerNetworkInfo, + ResolutionUpdateData, + AutoResolutionUpdateData, VideoJSComponentInterface, - PeertubePluginOptions, videojsUntyped, VideoJSCaption, - UserWatching + UserWatching, + PeerTubePluginOptions, + WebtorrentPluginOptions, + P2PMediaLoaderPluginOptions, + VideoJSPluginOptions, + LoadedQualityData } diff --git a/client/src/assets/player/resolution-menu-button.ts b/client/src/assets/player/resolution-menu-button.ts deleted file mode 100644 index a3c1108ca..000000000 --- a/client/src/assets/player/resolution-menu-button.ts +++ /dev/null @@ -1,88 +0,0 @@ -// FIXME: something weird with our path definition in tsconfig and typings -// @ts-ignore -import { Player } from 'video.js' - -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' -import { ResolutionMenuItem } from './resolution-menu-item' - -const Menu: VideoJSComponentInterface = videojsUntyped.getComponent('Menu') -const MenuButton: VideoJSComponentInterface = videojsUntyped.getComponent('MenuButton') -class ResolutionMenuButton extends MenuButton { - label: HTMLElement - - constructor (player: Player, options: any) { - super(player, options) - this.player = player - - player.peertube().on('videoFileUpdate', () => this.updateLabel()) - player.peertube().on('autoResolutionUpdate', () => this.updateLabel()) - } - - createEl () { - const el = super.createEl() - - this.labelEl_ = videojsUntyped.dom.createEl('div', { - className: 'vjs-resolution-value', - innerHTML: this.buildLabelHTML() - }) - - el.appendChild(this.labelEl_) - - return el - } - - updateARIAAttributes () { - this.el().setAttribute('aria-label', 'Quality') - } - - createMenu () { - const menu = new Menu(this.player_) - for (const videoFile of this.player_.peertube().videoFiles) { - let label = videoFile.resolution.label - if (videoFile.fps && videoFile.fps >= 50) { - label += videoFile.fps - } - - menu.addChild(new ResolutionMenuItem( - this.player_, - { - id: videoFile.resolution.id, - label, - src: videoFile.magnetUri - }) - ) - } - - menu.addChild(new ResolutionMenuItem( - this.player_, - { - id: -1, - label: this.player_.localize('Auto'), - src: null - } - )) - - return menu - } - - updateLabel () { - if (!this.labelEl_) return - - this.labelEl_.innerHTML = this.buildLabelHTML() - } - - buildCSSClass () { - return super.buildCSSClass() + ' vjs-resolution-button' - } - - buildWrapperCSSClass () { - return 'vjs-resolution-control ' + super.buildWrapperCSSClass() - } - - private buildLabelHTML () { - return this.player_.peertube().getCurrentResolutionLabel() - } -} -ResolutionMenuButton.prototype.controlText_ = 'Quality' - -MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton) diff --git a/client/src/assets/player/resolution-menu-item.ts b/client/src/assets/player/resolution-menu-item.ts deleted file mode 100644 index b54fd91ef..000000000 --- a/client/src/assets/player/resolution-menu-item.ts +++ /dev/null @@ -1,67 +0,0 @@ -// FIXME: something weird with our path definition in tsconfig and typings -// @ts-ignore -import { Player } from 'video.js' - -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' - -const MenuItem: VideoJSComponentInterface = videojsUntyped.getComponent('MenuItem') -class ResolutionMenuItem extends MenuItem { - - constructor (player: Player, options: any) { - const currentResolutionId = player.peertube().getCurrentResolutionId() - options.selectable = true - options.selected = options.id === currentResolutionId - - super(player, options) - - this.label = options.label - this.id = options.id - - player.peertube().on('videoFileUpdate', () => this.updateSelection()) - player.peertube().on('autoResolutionUpdate', () => this.updateSelection()) - } - - handleClick (event: any) { - if (this.id === -1 && this.player_.peertube().isAutoResolutionForbidden()) return - - super.handleClick(event) - - // Auto resolution - if (this.id === -1) { - this.player_.peertube().enableAutoResolution() - return - } - - this.player_.peertube().disableAutoResolution() - this.player_.peertube().updateResolution(this.id) - } - - updateSelection () { - // Check if auto resolution is forbidden or not - if (this.id === -1) { - if (this.player_.peertube().isAutoResolutionForbidden()) { - this.addClass('disabled') - } else { - this.removeClass('disabled') - } - } - - if (this.player_.peertube().isAutoResolutionOn()) { - this.selected(this.id === -1) - return - } - - this.selected(this.player_.peertube().getCurrentResolutionId() === this.id) - } - - getLabel () { - if (this.id === -1) { - return this.label + ' ' + this.player_.peertube().getCurrentResolutionLabel() + '' - } - - return this.label - } -} -MenuItem.registerComponent('ResolutionMenuItem', ResolutionMenuItem) - -export { ResolutionMenuItem } diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts index 8b9f34b99..8d87567c2 100644 --- a/client/src/assets/player/utils.ts +++ b/client/src/assets/player/utils.ts @@ -112,9 +112,23 @@ function videoFileMinByResolution (files: VideoFile[]) { return min } +function getRtcConfig () { + return { + iceServers: [ + { + urls: 'stun:stun.stunprotocol.org' + }, + { + urls: 'stun:stun.framasoft.org' + } + ] + } +} + // --------------------------------------------------------------------------- export { + getRtcConfig, toTitleCase, timeToInt, buildVideoLink, diff --git a/client/src/assets/player/webtorrent-info-button.ts b/client/src/assets/player/videojs-components/p2p-info-button.ts similarity index 77% rename from client/src/assets/player/webtorrent-info-button.ts rename to client/src/assets/player/videojs-components/p2p-info-button.ts index c3c1af951..6424787b2 100644 --- a/client/src/assets/player/webtorrent-info-button.ts +++ b/client/src/assets/player/videojs-components/p2p-info-button.ts @@ -1,8 +1,8 @@ -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' -import { bytes } from './utils' +import { PlayerNetworkInfo, VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' +import { bytes } from '../utils' const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button') -class WebtorrentInfoButton extends Button { +class P2pInfoButton extends Button { createEl () { const div = videojsUntyped.dom.createEl('div', { @@ -65,7 +65,7 @@ class WebtorrentInfoButton extends Button { subDivHttp.appendChild(subDivHttpText) div.appendChild(subDivHttp) - this.player_.peertube().on('torrentInfo', (event: any, data: any) => { + this.player_.on('p2pInfo', (event: any, data: PlayerNetworkInfo) => { // We are in HTTP fallback if (!data) { subDivHttp.className = 'vjs-peertube-displayed' @@ -74,11 +74,14 @@ class WebtorrentInfoButton extends Button { return } - const downloadSpeed = bytes(data.downloadSpeed) - const uploadSpeed = bytes(data.uploadSpeed) - const totalDownloaded = bytes(data.downloaded) - const totalUploaded = bytes(data.uploaded) - const numPeers = data.numPeers + const p2pStats = data.p2p + const httpStats = data.http + + const downloadSpeed = bytes(p2pStats.downloadSpeed + httpStats.downloadSpeed) + const uploadSpeed = bytes(p2pStats.uploadSpeed + httpStats.uploadSpeed) + const totalDownloaded = bytes(p2pStats.downloaded + httpStats.downloaded) + const totalUploaded = bytes(p2pStats.uploaded + httpStats.uploaded) + const numPeers = p2pStats.numPeers subDivWebtorrent.title = this.player_.localize('Total downloaded: ') + totalDownloaded.join(' ') + '\n' + this.player_.localize('Total uploaded: ' + totalUploaded.join(' ')) @@ -90,7 +93,7 @@ class WebtorrentInfoButton extends Button { uploadSpeedUnit.textContent = ' ' + uploadSpeed[ 1 ] peersNumber.textContent = numPeers - peersText.textContent = ' ' + this.player_.localize('peers') + peersText.textContent = ' ' + (numPeers > 1 ? this.player_.localize('peers') : this.player_.localize('peer')) subDivHttp.className = 'vjs-peertube-hidden' subDivWebtorrent.className = 'vjs-peertube-displayed' @@ -99,4 +102,4 @@ class WebtorrentInfoButton extends Button { return div } } -Button.registerComponent('WebTorrentButton', WebtorrentInfoButton) +Button.registerComponent('P2PInfoButton', P2pInfoButton) diff --git a/client/src/assets/player/peertube-link-button.ts b/client/src/assets/player/videojs-components/peertube-link-button.ts similarity index 87% rename from client/src/assets/player/peertube-link-button.ts rename to client/src/assets/player/videojs-components/peertube-link-button.ts index de9a49de9..fed8ea33e 100644 --- a/client/src/assets/player/peertube-link-button.ts +++ b/client/src/assets/player/videojs-components/peertube-link-button.ts @@ -1,5 +1,5 @@ -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' -import { buildVideoLink } from './utils' +import { VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' +import { buildVideoLink } from '../utils' // FIXME: something weird with our path definition in tsconfig and typings // @ts-ignore import { Player } from 'video.js' diff --git a/client/src/assets/player/peertube-load-progress-bar.ts b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts similarity index 85% rename from client/src/assets/player/peertube-load-progress-bar.ts rename to client/src/assets/player/videojs-components/peertube-load-progress-bar.ts index af276d1b2..9a0e3b550 100644 --- a/client/src/assets/player/peertube-load-progress-bar.ts +++ b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts @@ -1,4 +1,4 @@ -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' +import { VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' // FIXME: something weird with our path definition in tsconfig and typings // @ts-ignore import { Player } from 'video.js' @@ -27,7 +27,7 @@ class PeerTubeLoadProgressBar extends Component { } update () { - const torrent = this.player().peertube().getTorrent() + const torrent = this.player().webtorrent().getTorrent() if (!torrent) return this.el_.style.width = (torrent.progress * 100) + '%' diff --git a/client/src/assets/player/videojs-components/resolution-menu-button.ts b/client/src/assets/player/videojs-components/resolution-menu-button.ts new file mode 100644 index 000000000..abcc16411 --- /dev/null +++ b/client/src/assets/player/videojs-components/resolution-menu-button.ts @@ -0,0 +1,109 @@ +// FIXME: something weird with our path definition in tsconfig and typings +// @ts-ignore +import { Player } from 'video.js' + +import { LoadedQualityData, VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' +import { ResolutionMenuItem } from './resolution-menu-item' + +const Menu: VideoJSComponentInterface = videojsUntyped.getComponent('Menu') +const MenuButton: VideoJSComponentInterface = videojsUntyped.getComponent('MenuButton') +class ResolutionMenuButton extends MenuButton { + label: HTMLElement + + constructor (player: Player, options: any) { + super(player, options) + this.player = player + + player.tech_.on('loadedqualitydata', (e: any, data: any) => this.buildQualities(data)) + + player.peertube().on('resolutionChange', () => setTimeout(() => this.trigger('updateLabel'), 0)) + } + + createEl () { + const el = super.createEl() + + this.labelEl_ = videojsUntyped.dom.createEl('div', { + className: 'vjs-resolution-value' + }) + + el.appendChild(this.labelEl_) + + return el + } + + updateARIAAttributes () { + this.el().setAttribute('aria-label', 'Quality') + } + + createMenu () { + return new Menu(this.player_) + } + + buildCSSClass () { + return super.buildCSSClass() + ' vjs-resolution-button' + } + + buildWrapperCSSClass () { + return 'vjs-resolution-control ' + super.buildWrapperCSSClass() + } + + private addClickListener (component: any) { + component.on('click', () => { + let children = this.menu.children() + + for (const child of children) { + if (component !== child) { + child.selected(false) + } + } + }) + } + + private buildQualities (data: LoadedQualityData) { + // The automatic resolution item will need other labels + const labels: { [ id: number ]: string } = {} + + data.qualityData.video.sort((a, b) => { + if (a.id > b.id) return -1 + if (a.id === b.id) return 0 + return 1 + }) + + for (const d of data.qualityData.video) { + // Skip auto resolution, we'll add it ourselves + if (d.id === -1) continue + + this.menu.addChild(new ResolutionMenuItem( + this.player_, + { + id: d.id, + label: d.label, + selected: d.selected, + callback: data.qualitySwitchCallback + }) + ) + + labels[d.id] = d.label + } + + this.menu.addChild(new ResolutionMenuItem( + this.player_, + { + id: -1, + label: this.player_.localize('Auto'), + labels, + callback: data.qualitySwitchCallback, + selected: true // By default, in auto mode + } + )) + + for (const m of this.menu.children()) { + this.addClickListener(m) + } + + this.trigger('menuChanged') + } +} +ResolutionMenuButton.prototype.controlText_ = 'Quality' + +MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton) diff --git a/client/src/assets/player/videojs-components/resolution-menu-item.ts b/client/src/assets/player/videojs-components/resolution-menu-item.ts new file mode 100644 index 000000000..6c42fefd2 --- /dev/null +++ b/client/src/assets/player/videojs-components/resolution-menu-item.ts @@ -0,0 +1,83 @@ +// FIXME: something weird with our path definition in tsconfig and typings +// @ts-ignore +import { Player } from 'video.js' + +import { AutoResolutionUpdateData, ResolutionUpdateData, VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' + +const MenuItem: VideoJSComponentInterface = videojsUntyped.getComponent('MenuItem') +class ResolutionMenuItem extends MenuItem { + private readonly id: number + private readonly label: string + // Only used for the automatic item + private readonly labels: { [id: number]: string } + private readonly callback: Function + + private autoResolutionPossible: boolean + private currentResolutionLabel: string + + constructor (player: Player, options: any) { + options.selectable = true + + super(player, options) + + this.autoResolutionPossible = true + this.currentResolutionLabel = '' + + this.label = options.label + this.labels = options.labels + this.id = options.id + this.callback = options.callback + + player.peertube().on('resolutionChange', (_: any, data: ResolutionUpdateData) => this.updateSelection(data)) + + // We only want to disable the "Auto" item + if (this.id === -1) { + player.peertube().on('autoResolutionChange', (_: any, data: AutoResolutionUpdateData) => this.updateAutoResolution(data)) + } + } + + handleClick (event: any) { + // Auto button disabled? + if (this.autoResolutionPossible === false && this.id === -1) return + + super.handleClick(event) + + this.callback(this.id, 'video') + } + + updateSelection (data: ResolutionUpdateData) { + if (this.id === -1) { + this.currentResolutionLabel = this.labels[data.id] + } + + // Automatic resolution only + if (data.auto === true) { + this.selected(this.id === -1) + return + } + + this.selected(this.id === data.id) + } + + updateAutoResolution (data: AutoResolutionUpdateData) { + // Check if the auto resolution is enabled or not + if (data.possible === false) { + this.addClass('disabled') + } else { + this.removeClass('disabled') + } + + this.autoResolutionPossible = data.possible + } + + getLabel () { + if (this.id === -1) { + return this.label + ' ' + this.currentResolutionLabel + '' + } + + return this.label + } +} +MenuItem.registerComponent('ResolutionMenuItem', ResolutionMenuItem) + +export { ResolutionMenuItem } diff --git a/client/src/assets/player/settings-menu-button.ts b/client/src/assets/player/videojs-components/settings-menu-button.ts similarity index 98% rename from client/src/assets/player/settings-menu-button.ts rename to client/src/assets/player/videojs-components/settings-menu-button.ts index a7aefdcc3..14cb8ba43 100644 --- a/client/src/assets/player/settings-menu-button.ts +++ b/client/src/assets/player/videojs-components/settings-menu-button.ts @@ -6,8 +6,8 @@ import * as videojs from 'video.js' import { SettingsMenuItem } from './settings-menu-item' -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' -import { toTitleCase } from './utils' +import { VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' +import { toTitleCase } from '../utils' const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button') const Menu: VideoJSComponentInterface = videojsUntyped.getComponent('Menu') diff --git a/client/src/assets/player/settings-menu-item.ts b/client/src/assets/player/videojs-components/settings-menu-item.ts similarity index 91% rename from client/src/assets/player/settings-menu-item.ts rename to client/src/assets/player/videojs-components/settings-menu-item.ts index 698f4627a..f14959f9c 100644 --- a/client/src/assets/player/settings-menu-item.ts +++ b/client/src/assets/player/videojs-components/settings-menu-item.ts @@ -5,8 +5,8 @@ // @ts-ignore import * as videojs from 'video.js' -import { toTitleCase } from './utils' -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' +import { toTitleCase } from '../utils' +import { VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' const MenuItem: VideoJSComponentInterface = videojsUntyped.getComponent('MenuItem') const component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') @@ -48,6 +48,19 @@ class SettingsMenuItem extends MenuItem { // Update on rate change player.on('ratechange', this.submenuClickHandler) + if (subMenuName === 'CaptionsButton') { + // Hack to regenerate captions on HTTP fallback + player.on('captionsChanged', () => { + setTimeout(() => { + this.settingsSubMenuEl_.innerHTML = '' + this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el_) + this.update() + this.bindClickEvents() + + }, 0) + }) + } + this.reset() }, 0) }) @@ -207,12 +220,14 @@ class SettingsMenuItem extends MenuItem { } build () { - const saveUpdateLabel = this.subMenu.updateLabel - this.subMenu.updateLabel = () => { + this.subMenu.on('updateLabel', () => { this.update() - - saveUpdateLabel.call(this.subMenu) - } + }) + this.subMenu.on('menuChanged', () => { + this.bindClickEvents() + this.setSize() + this.update() + }) this.settingsSubMenuTitleEl_.innerHTML = this.player_.localize(this.subMenu.controlText_) this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el_) @@ -220,7 +235,7 @@ class SettingsMenuItem extends MenuItem { this.update() this.createBackButton() - this.getSize() + this.setSize() this.bindClickEvents() // prefixed event listeners for CSS TransitionEnd @@ -282,8 +297,9 @@ class SettingsMenuItem extends MenuItem { // save size of submenus on first init // if number of submenu items change dynamically more logic will be needed - getSize () { + setSize () { this.dialog.removeClass('vjs-hidden') + videojsUntyped.dom.removeClass(this.settingsSubMenuEl_, 'vjs-hidden') this.size = this.settingsButton.getComponentSize(this.settingsSubMenuEl_) this.setMargin() this.dialog.addClass('vjs-hidden') diff --git a/client/src/assets/player/theater-button.ts b/client/src/assets/player/videojs-components/theater-button.ts similarity index 87% rename from client/src/assets/player/theater-button.ts rename to client/src/assets/player/videojs-components/theater-button.ts index 4f8fede3d..1e11a9546 100644 --- a/client/src/assets/player/theater-button.ts +++ b/client/src/assets/player/videojs-components/theater-button.ts @@ -2,8 +2,8 @@ // @ts-ignore import * as videojs from 'video.js' -import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' -import { saveTheaterInStore, getStoredTheater } from './peertube-player-local-storage' +import { VideoJSComponentInterface, videojsUntyped } from '../peertube-videojs-typings' +import { saveTheaterInStore, getStoredTheater } from '../peertube-player-local-storage' const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button') class TheaterButton extends Button { diff --git a/client/src/assets/player/peertube-chunk-store.ts b/client/src/assets/player/webtorrent/peertube-chunk-store.ts similarity index 100% rename from client/src/assets/player/peertube-chunk-store.ts rename to client/src/assets/player/webtorrent/peertube-chunk-store.ts diff --git a/client/src/assets/player/video-renderer.ts b/client/src/assets/player/webtorrent/video-renderer.ts similarity index 100% rename from client/src/assets/player/video-renderer.ts rename to client/src/assets/player/webtorrent/video-renderer.ts diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/webtorrent/webtorrent-plugin.ts similarity index 71% rename from client/src/assets/player/peertube-videojs-plugin.ts rename to client/src/assets/player/webtorrent/webtorrent-plugin.ts index 4a280b7ef..c69bf31fa 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/webtorrent/webtorrent-plugin.ts @@ -3,23 +3,18 @@ import * as videojs from 'video.js' import * as WebTorrent from 'webtorrent' -import { VideoFile } from '../../../../shared/models/videos/video.model' +import { VideoFile } from '../../../../../shared/models/videos/video.model' import { renderVideo } from './video-renderer' -import './settings-menu-button' -import { PeertubePluginOptions, UserWatching, VideoJSCaption, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' -import { isMobile, timeToInt, videoFileMaxByResolution, videoFileMinByResolution } from './utils' +import { LoadedQualityData, PlayerNetworkInfo, VideoJSComponentInterface, WebtorrentPluginOptions } from '../peertube-videojs-typings' +import { getRtcConfig, videoFileMaxByResolution, videoFileMinByResolution } from '../utils' import { PeertubeChunkStore } from './peertube-chunk-store' import { getAverageBandwidthInStore, - getStoredLastSubtitle, getStoredMute, getStoredVolume, getStoredWebTorrentEnabled, - saveAverageBandwidth, - saveLastSubtitle, - saveMuteInStore, - saveVolumeInStore -} from './peertube-player-local-storage' + saveAverageBandwidth +} from '../peertube-player-local-storage' const CacheChunkStore = require('cache-chunk-store') @@ -30,14 +25,13 @@ type PlayOptions = { } const Plugin: VideoJSComponentInterface = videojs.getPlugin('plugin') -class PeerTubePlugin extends Plugin { +class WebTorrentPlugin extends Plugin { private readonly playerElement: HTMLVideoElement private readonly autoplay: boolean = false private readonly startTime: number = 0 private readonly savePlayerSrcFunction: Function private readonly videoFiles: VideoFile[] - private readonly videoViewUrl: string private readonly videoDuration: number private readonly CONSTANTS = { INFO_SCHEDULER: 1000, // Don't change this @@ -45,22 +39,12 @@ class PeerTubePlugin extends Plugin { AUTO_QUALITY_THRESHOLD_PERCENT: 30, // Bandwidth should be 30% more important than a resolution bitrate to change to it AUTO_QUALITY_OBSERVATION_TIME: 10000, // Wait 10 seconds after having change the resolution before another check AUTO_QUALITY_HIGHER_RESOLUTION_DELAY: 5000, // Buffering higher resolution during 5 seconds - BANDWIDTH_AVERAGE_NUMBER_OF_VALUES: 5, // Last 5 seconds to build average bandwidth - USER_WATCHING_VIDEO_INTERVAL: 5000 // Every 5 seconds, notify the user is watching the video + BANDWIDTH_AVERAGE_NUMBER_OF_VALUES: 5 // Last 5 seconds to build average bandwidth } private readonly webtorrent = new WebTorrent({ tracker: { - rtcConfig: { - iceServers: [ - { - urls: 'stun:stun.stunprotocol.org' - }, - { - urls: 'stun:stun.framasoft.org' - } - ] - } + rtcConfig: getRtcConfig() }, dht: false }) @@ -68,46 +52,37 @@ class PeerTubePlugin extends Plugin { private player: any private currentVideoFile: VideoFile private torrent: WebTorrent.Torrent - private videoCaptions: VideoJSCaption[] - private defaultSubtitle: string private renderer: any private fakeRenderer: any private destroyingFakeRenderer = false private autoResolution = true - private forbidAutoResolution = false + private autoResolutionPossible = true private isAutoResolutionObservation = false private playerRefusedP2P = false - private videoViewInterval: any private torrentInfoInterval: any private autoQualityInterval: any - private userWatchingVideoInterval: any private addTorrentDelay: any private qualityObservationTimer: any private runAutoQualitySchedulerTimer: any private downloadSpeeds: number[] = [] - constructor (player: videojs.Player, options: PeertubePluginOptions) { + constructor (player: videojs.Player, options: WebtorrentPluginOptions) { super(player, options) // Disable auto play on iOS this.autoplay = options.autoplay && this.isIOS() === false this.playerRefusedP2P = !getStoredWebTorrentEnabled() - this.startTime = timeToInt(options.startTime) this.videoFiles = options.videoFiles - this.videoViewUrl = options.videoViewUrl this.videoDuration = options.videoDuration - this.videoCaptions = options.videoCaptions this.savePlayerSrcFunction = this.player.src this.playerElement = options.playerElement - if (this.autoplay === true) this.player.addClass('vjs-has-autoplay') - this.player.ready(() => { const playerOptions = this.player.options_ @@ -117,33 +92,10 @@ class PeerTubePlugin extends Plugin { const muted = playerOptions.muted !== undefined ? playerOptions.muted : getStoredMute() if (muted !== undefined) this.player.muted(muted) - this.defaultSubtitle = options.subtitle || getStoredLastSubtitle() - - this.player.on('volumechange', () => { - saveVolumeInStore(this.player.volume()) - saveMuteInStore(this.player.muted()) - }) - - this.player.textTracks().on('change', () => { - const showing = this.player.textTracks().tracks_.find((t: { kind: string, mode: string }) => { - return t.kind === 'captions' && t.mode === 'showing' - }) - - if (!showing) { - saveLastSubtitle('off') - return - } - - saveLastSubtitle(showing.language) - }) - this.player.duration(options.videoDuration) this.initializePlayer() this.runTorrentInfoScheduler() - this.runViewAdd() - - if (options.userWatching) this.runUserWatchVideo(options.userWatching) this.player.one('play', () => { // Don't run immediately scheduler, wait some seconds the TCP connections are made @@ -157,12 +109,9 @@ class PeerTubePlugin extends Plugin { clearTimeout(this.qualityObservationTimer) clearTimeout(this.runAutoQualitySchedulerTimer) - clearInterval(this.videoViewInterval) clearInterval(this.torrentInfoInterval) clearInterval(this.autoQualityInterval) - if (this.userWatchingVideoInterval) clearInterval(this.userWatchingVideoInterval) - // Don't need to destroy renderer, video player will be destroyed this.flushVideoFile(this.currentVideoFile, false) @@ -173,13 +122,6 @@ class PeerTubePlugin extends Plugin { return this.currentVideoFile ? this.currentVideoFile.resolution.id : -1 } - getCurrentResolutionLabel () { - if (!this.currentVideoFile) return '' - - const fps = this.currentVideoFile.fps >= 50 ? this.currentVideoFile.fps : '' - return this.currentVideoFile.resolution.label + fps - } - updateVideoFile ( videoFile?: VideoFile, options: { @@ -228,7 +170,8 @@ class PeerTubePlugin extends Plugin { return done() }) - this.trigger('videoFileUpdate') + this.changeQuality() + this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.currentVideoFile.resolution.id }) } updateResolution (resolutionId: number, delay = 0) { @@ -262,28 +205,17 @@ class PeerTubePlugin extends Plugin { } } - isAutoResolutionOn () { - return this.autoResolution - } - enableAutoResolution () { this.autoResolution = true - this.trigger('autoResolutionUpdate') + this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.getCurrentResolutionId() }) } disableAutoResolution (forbid = false) { - if (forbid === true) this.forbidAutoResolution = true + if (forbid === true) this.autoResolutionPossible = false this.autoResolution = false - this.trigger('autoResolutionUpdate') - } - - isAutoResolutionForbidden () { - return this.forbidAutoResolution === true - } - - getCurrentVideoFile () { - return this.currentVideoFile + this.trigger('autoResolutionChange', { possible: this.autoResolutionPossible }) + this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.getCurrentResolutionId() }) } getTorrent () { @@ -462,13 +394,7 @@ class PeerTubePlugin extends Plugin { } private initializePlayer () { - if (isMobile()) this.player.addClass('vjs-is-mobile') - - this.initSmoothProgressBar() - - this.initCaptions() - - this.alterInactivity() + this.buildQualities() if (this.autoplay === true) { this.player.posterImage.hide() @@ -491,7 +417,7 @@ class PeerTubePlugin extends Plugin { // Not initialized or in HTTP fallback if (this.torrent === undefined || this.torrent === null) return - if (this.isAutoResolutionOn() === false) return + if (this.autoResolution === false) return if (this.isAutoResolutionObservation === true) return const file = this.getAppropriateFile() @@ -531,78 +457,27 @@ class PeerTubePlugin extends Plugin { if (this.torrent === undefined) return // Http fallback - if (this.torrent === null) return this.trigger('torrentInfo', false) + if (this.torrent === null) return this.player.trigger('p2pInfo', false) // this.webtorrent.downloadSpeed because we need to take into account the potential old torrent too if (this.webtorrent.downloadSpeed !== 0) this.downloadSpeeds.push(this.webtorrent.downloadSpeed) - return this.trigger('torrentInfo', { - downloadSpeed: this.torrent.downloadSpeed, - numPeers: this.torrent.numPeers, - uploadSpeed: this.torrent.uploadSpeed, - downloaded: this.torrent.downloaded, - uploaded: this.torrent.uploaded - }) - }, this.CONSTANTS.INFO_SCHEDULER) - } - - private runViewAdd () { - this.clearVideoViewInterval() - - // After 30 seconds (or 3/4 of the video), add a view to the video - let minSecondsToView = 30 - - if (this.videoDuration < minSecondsToView) minSecondsToView = (this.videoDuration * 3) / 4 - - let secondsViewed = 0 - this.videoViewInterval = setInterval(() => { - if (this.player && !this.player.paused()) { - secondsViewed += 1 - - if (secondsViewed > minSecondsToView) { - this.clearVideoViewInterval() - - this.addViewToVideo().catch(err => console.error(err)) + return this.player.trigger('p2pInfo', { + http: { + downloadSpeed: 0, + uploadSpeed: 0, + downloaded: 0, + uploaded: 0 + }, + p2p: { + downloadSpeed: this.torrent.downloadSpeed, + numPeers: this.torrent.numPeers, + uploadSpeed: this.torrent.uploadSpeed, + downloaded: this.torrent.downloaded, + uploaded: this.torrent.uploaded } - } - }, 1000) - } - - private runUserWatchVideo (options: UserWatching) { - let lastCurrentTime = 0 - - this.userWatchingVideoInterval = setInterval(() => { - const currentTime = Math.floor(this.player.currentTime()) - - if (currentTime - lastCurrentTime >= 1) { - lastCurrentTime = currentTime - - this.notifyUserIsWatching(currentTime, options.url, options.authorizationHeader) - .catch(err => console.error('Cannot notify user is watching.', err)) - } - }, this.CONSTANTS.USER_WATCHING_VIDEO_INTERVAL) - } - - private clearVideoViewInterval () { - if (this.videoViewInterval !== undefined) { - clearInterval(this.videoViewInterval) - this.videoViewInterval = undefined - } - } - - private addViewToVideo () { - if (!this.videoViewUrl) return Promise.resolve(undefined) - - return fetch(this.videoViewUrl, { method: 'POST' }) - } - - private notifyUserIsWatching (currentTime: number, url: string, authorizationHeader: string) { - const body = new URLSearchParams() - body.append('currentTime', currentTime.toString()) - - const headers = new Headers({ 'Authorization': authorizationHeader }) - - return fetch(url, { method: 'PUT', body, headers }) + } as PlayerNetworkInfo) + }, this.CONSTANTS.INFO_SCHEDULER) } private fallbackToHttp (options: PlayOptions, done?: Function) { @@ -620,6 +495,11 @@ class PeerTubePlugin extends Plugin { this.player.src = this.savePlayerSrcFunction this.player.src(httpUrl) + this.changeQuality() + + // We changed the source, so reinit captions + this.player.trigger('sourcechange') + return this.tryToPlay(err => { if (err && done) return done(err) @@ -646,25 +526,6 @@ class PeerTubePlugin extends Plugin { return !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform) } - private alterInactivity () { - let saveInactivityTimeout: number - - const disableInactivity = () => { - saveInactivityTimeout = this.player.options_.inactivityTimeout - this.player.options_.inactivityTimeout = 0 - } - const enableInactivity = () => { - this.player.options_.inactivityTimeout = saveInactivityTimeout - } - - const settingsDialog = this.player.children_.find((c: any) => c.name_ === 'SettingsDialog') - - this.player.controlBar.on('mouseenter', () => disableInactivity()) - settingsDialog.on('mouseenter', () => disableInactivity()) - this.player.controlBar.on('mouseleave', () => enableInactivity()) - settingsDialog.on('mouseleave', () => enableInactivity()) - } - private pickAverageVideoFile () { if (this.videoFiles.length === 1) return this.videoFiles[0] @@ -709,41 +570,70 @@ class PeerTubePlugin extends Plugin { } } - private initCaptions () { - for (const caption of this.videoCaptions) { - this.player.addRemoteTextTrack({ - kind: 'captions', - label: caption.label, - language: caption.language, - id: caption.language, - src: caption.src, - default: this.defaultSubtitle === caption.language - }, false) + private buildQualities () { + const qualityLevelsPayload = [] + + for (const file of this.videoFiles) { + const representation = { + id: file.resolution.id, + label: this.buildQualityLabel(file), + height: file.resolution.id, + _enabled: true + } + + this.player.qualityLevels().addQualityLevel(representation) + + qualityLevelsPayload.push({ + id: representation.id, + label: representation.label, + selected: false + }) + } + + const payload: LoadedQualityData = { + qualitySwitchCallback: (d: any) => this.qualitySwitchCallback(d), + qualityData: { + video: qualityLevelsPayload + } } + this.player.tech_.trigger('loadedqualitydata', payload) } - // Thanks: https://github.com/videojs/video.js/issues/4460#issuecomment-312861657 - private initSmoothProgressBar () { - const SeekBar = videojsUntyped.getComponent('SeekBar') - SeekBar.prototype.getPercent = function getPercent () { - // Allows for smooth scrubbing, when player can't keep up. - // const time = (this.player_.scrubbing()) ? - // this.player_.getCache().currentTime : - // this.player_.currentTime() - const time = this.player_.currentTime() - const percent = time / this.player_.duration() - return percent >= 1 ? 1 : percent + private buildQualityLabel (file: VideoFile) { + let label = file.resolution.label + + if (file.fps && file.fps >= 50) { + label += file.fps } - SeekBar.prototype.handleMouseMove = function handleMouseMove (event: any) { - let newTime = this.calculateDistance(event) * this.player_.duration() - if (newTime === this.player_.duration()) { - newTime = newTime - 0.1 - } - this.player_.currentTime(newTime) - this.update() + + return label + } + + private qualitySwitchCallback (id: number) { + if (id === -1) { + if (this.autoResolutionPossible === true) this.enableAutoResolution() + return + } + + this.disableAutoResolution() + this.updateResolution(id) + } + + private changeQuality () { + const resolutionId = this.currentVideoFile.resolution.id + const qualityLevels = this.player.qualityLevels() + + if (resolutionId === -1) { + qualityLevels.selectedIndex = -1 + return + } + + for (let i = 0; i < qualityLevels; i++) { + const q = this.player.qualityLevels[i] + if (q.height === resolutionId) qualityLevels.selectedIndex = i } } } -videojs.registerPlugin('peertube', PeerTubePlugin) -export { PeerTubePlugin } +videojs.registerPlugin('webtorrent', WebTorrentPlugin) +export { WebTorrentPlugin } diff --git a/client/src/index.html b/client/src/index.html index 2af0020ad..8c257824e 100644 --- a/client/src/index.html +++ b/client/src/index.html @@ -5,7 +5,7 @@ - + diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index d61d4f9f2..3aa178825 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml @@ -1120,45 +1120,45 @@ Display unlisted and private videos app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 No results. app/shared/video/abstract-video-list.html - 17 + 20 app/shared/video/abstract-video-list.html - 17 + 20 app/shared/video/abstract-video-list.html - 17 + 20 app/shared/video/abstract-video-list.html - 17 + 20 app/videos/video-list/video-overview.component.html @@ -1166,7 +1166,7 @@ app/shared/video/abstract-video-list.html - 17 + 20 app/+my-account/my-account-videos/my-account-videos.component.html @@ -1174,7 +1174,7 @@ app/shared/video/abstract-video-list.html - 17 + 20 @@ -1266,7 +1266,7 @@ app/videos/+video-watch/modal/video-blacklist.component.html - 19 + 26 Submit @@ -1288,7 +1288,7 @@ app/videos/+video-watch/modal/video-blacklist.component.html - 24 + 31 About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance @@ -2347,19 +2347,19 @@ User's email must be verified to login app/+admin/users/user-list/user-list.component.html - 70 + 72 User's email is verified / User can login without email verification app/+admin/users/user-list/user-list.component.html - 74 + 76 Ban reason: app/+admin/users/user-list/user-list.component.html - 92 + 95 Moderation comment @@ -2425,7 +2425,7 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 24 + 25 app/+my-account/my-account-ownership/my-account-ownership.component.html @@ -2439,7 +2439,7 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 33 + 35 Reason: @@ -2465,17 +2465,23 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html 9 + + Unfederated + + app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html + 10 + Date <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="<p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="</p-sortIcon>"/> app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 10 + 11 Blacklist reason: app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 41 + 43 Moderation @@ -3089,17 +3095,25 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/video-add-components/video-upload.component.html 25 + + + Congratulations! Your video is now available in your private library. + + + app/videos/+video-edit/video-add-components/video-upload.component.html + 45 + Publish will be available when upload is finished app/videos/+video-edit/video-add-components/video-upload.component.html - 54 + 58 Publish app/videos/+video-edit/video-add-components/video-upload.component.html - 61 + 65 Select the torrent to import @@ -3476,6 +3490,12 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/modal/video-blacklist.component.html 3 + + Unfederate the video (ask for its deletion from the remote instances) + + app/videos/+video-watch/modal/video-blacklist.component.html + 21 + The video is being imported, it will be available when the import is finished. @@ -4091,6 +4111,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + yes + + src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts + 1 + + + + no + + src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts + 1 + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. @@ -4457,15 +4491,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/>? It will delete all videos uploaded in this channel too. - - src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts - 1 - - - - Please type the name of the video channel to confirm + + Please type the display name of the video channel (<x id="INTERPOLATION" equiv-text="{{displayName}}"/>) to confirm src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts 1 @@ -5274,8 +5301,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. + + Report reason cannot be more than 3000 characters long. src/app/shared/forms/form-validators/video-abuse-validators.service.ts 1 @@ -5295,8 +5322,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. + + Moderation comment cannot be more than 3000 characters long. src/app/shared/forms/form-validators/video-abuse-validators.service.ts 1 @@ -5505,6 +5532,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + PeerTube cannot handle this kind of file. Accepted extensions are <x id="INTERPOLATION" equiv-text="{{extensions}}"/>. + + src/app/shared/forms/reactive-file.component.ts + 1 + + All unsaved data will be lost, are you sure you want to leave this page? @@ -6351,6 +6385,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + You have unsaved changes! If you leave, your changes will be lost. + + src/app/videos/+video-edit/video-update.component.ts + 1 + + Video updated. @@ -6439,6 +6480,34 @@ When you will upload a video in this channel, the video support field will be au 1 + + Trending for the last 24 hours + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending videos are those totalizing the greatest number of views during the last 24 hours. + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending for the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending videos are those totalizing the greatest number of views during the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days. + + src/app/videos/video-list/video-trending.component.ts + 1 + + Videos from your subscriptions diff --git a/client/src/locale/source/server_en_US.xml b/client/src/locale/source/server_en_US.xml index b6e62ce80..f5e125549 100644 --- a/client/src/locale/source/server_en_US.xml +++ b/client/src/locale/source/server_en_US.xml @@ -137,6 +137,22 @@ Failed undefined + + This video does not exist. + undefined + + + We cannot fetch the video. Please try again later. + undefined + + + Sorry + undefined + + + This video is not available because the remote instance is not responding. + undefined + Misc undefined diff --git a/client/src/locale/target/angular_ar_001.xml b/client/src/locale/target/angular_ar_001.xml index 894798226..978f69571 100644 --- a/client/src/locale/target/angular_ar_001.xml +++ b/client/src/locale/target/angular_ar_001.xml @@ -430,7 +430,7 @@ Password الكلمة السرية - 12 + 13 @@ -444,7 +444,7 @@ Login تسجيل الدخول - 38 + 36 @@ -472,7 +472,7 @@ Send me an email to reset my password أرسل لي رسالة لإعادة تعيين كلمتي السرية - 75 + 80 @@ -532,7 +532,7 @@ Signup سجل - 88 + 78 @@ -576,7 +576,7 @@ Change the language تغيير اللغة - 88 + 86 @@ -585,7 +585,7 @@ صفحتي العمومية - 18 + 16 @@ -594,7 +594,7 @@ حسابي - 22 + 20 @@ -603,7 +603,7 @@ فيديوهاتي - 26 + 24 @@ -612,14 +612,14 @@ الخروج - 30 + 28 Create an account إنشاء حساب - 39 + 37 @@ -633,49 +633,49 @@ Subscriptions الإشتراكات - 47 + 45 Overview نظرة شاملة - 52 + 50 Trending الشائعة - 57 + 55 Recently added التي تم إضافتها حديثًا - 62 + 60 Local المحلية - 67 + 65 More المزيد - 72 + 70 Administration الإدارة - 76 + 74 @@ -689,7 +689,7 @@ Toggle dark interface الإنتقال إلى الواجهة الداكنة - 94 + 92 @@ -794,7 +794,7 @@ No results. لا نتائج - 17 + 20 @@ -811,15 +811,20 @@ 7 - + - About instance - - - حول مثيل الخدوم - + Cancel + + إلغاء - 1 + 26 + + + + Submit + إرسال + + 31 @@ -833,44 +838,14 @@ Terms الشروط - 44 + 39 User registration is allowed and التسجيل مسموح و - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - -مثيل الخادوم هذا يوفر مساحة لفيديوهات المستخدمين. - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - -مثيل الخادوم هذا يوفر مساحة غير محددة لفيديوهات المستخدمين. - - 31 - - - - - User registration is currently not allowed. - - -التسجيل غير مسموح حاليا. - - 36 + 29 @@ -1052,42 +1027,42 @@ Short description الوصف القصير - 22 + 21 Videos Overview نظرة شاملة عن الفيديوهات - 58 + 51 Videos Trending الفيديوهات الشائعة - 59 + 52 Videos Recently Added الفيديوهات المُضافة حديثًا - 60 + 53 Local videos الفيديوهات المحلية - 61 + 54 Policy on videos containing sensitive content سياسة الفيديوهات التي تحتوي على محتوى حساس - 70 + 61 @@ -1108,23 +1083,44 @@ Signup enabled التسجيل مُفعل - 93 + 84 Signup requires email verification يتطلب التسجيل رسالة تأكيد - 100 + 91 Signup limit حد التسجيل + + 96 + + + + Users + المستخدِمون 105 + + User default video quota + حصة الفيديو الافتراضية للمستخدم + + 109 + + + + User default daily upload limit + حد الرفع الإفتراضي للمستخدِم + + 121 + + Import استيراد @@ -1136,35 +1132,14 @@ Administrator المدير - 131 + 155 Admin email البريد الإلكتروني للمدير - 134 - - - - Users - المستخدِمون - - 144 - - - - User default video quota - حصة الفيديو الافتراضية للمستخدم - - 147 - - - - User default daily upload limit - حد الرفع الإفتراضي للمستخدِم - - 161 + 158 @@ -1185,7 +1160,7 @@ Your Twitter username اسم المستخدِم الخاص بك على تويتر - 181 + 184 @@ -1199,21 +1174,21 @@ Customizations التخصيصات - 275 + 289 JavaScript الجافا سكريبت - 278 + 294 Advanced configuration الإعدادات المتقدمة - 207 + 212 @@ -1391,7 +1366,7 @@ Ban reason: سبب الحظر: - 92 + 95 @@ -1440,7 +1415,7 @@ Actions الإجراءات - 33 + 35 @@ -1468,7 +1443,7 @@ Blacklist reason: سبب الحجب: - 41 + 43 @@ -1499,62 +1474,6 @@ 23 - - My settings - إعداداتي - - 3 - - - - My library - مكتبتي - - 7 - - - - My channels - قنواتي - - 12 - - - - My videos - فيديوهاتي - - 14 - - - - My subscriptions - اشتراكاتي - - 16 - - - - My imports - وارداتي - - 18 - - - - Misc - أخرى - - 24 - - - - Muted instances - مثيلات الخوادم المكتومة - - 2 - - Video quota: تقم الفيديو: @@ -1566,21 +1485,21 @@ Profile الملف الشخصي - 8 + 7 Video settings إعدادات الفيديو - 15 + 16 Danger zone منطقة الخطر - 18 + 19 @@ -1606,13 +1525,6 @@ 35 - - Submit - إرسال - - 24 - - Blacklisted تم حجبه @@ -1699,6 +1611,13 @@ 47 + + Muted instances + مثيلات الخوادم المكتومة + + 2 + + Change password تغيير الكلمة السرية @@ -1836,7 +1755,7 @@ Publish أنشر - 60 + 65 @@ -1920,28 +1839,28 @@ Cancel create إلغاء الإنشاء - 169 + 170 Cancel deletion إلغاء الحذف - 177 + 178 Upload thumbnail تحديث الصورة المصغرة - 195 + 196 Upload preview إرسال معاينة - 202 + 203 @@ -1955,7 +1874,7 @@ Advanced settings الإعدادات المتقدمة - 190 + 191 @@ -2009,15 +1928,6 @@ 3 - - - Cancel - - إلغاء - - 19 - - Share شارك @@ -2259,13 +2169,6 @@ 1 - - Error - خطأ - - 1 - - 240p 240p @@ -2301,13 +2204,6 @@ 1 - - Success - تم بنجاح - - 1 - - Configuration updated. تم تحديث الإعدادات @@ -2490,9 +2386,9 @@ 1 - - Please type the name of the video channel to confirm - رجاء أدخل اسم القنات للتأكيد + + My videos + فيديوهاتي 1 @@ -2511,9 +2407,37 @@ 1 - - Channels - القنوات + + My library + مكتبتي + + 1 + + + + My channels + قنواتي + + 1 + + + + My subscriptions + اشتراكاتي + + 1 + + + + Misc + أخرى + + 1 + + + + My settings + إعداداتي 1 @@ -2602,6 +2526,13 @@ 1 + + Error + خطأ + + 1 + + You need to reconnect. يجب عليك إعادة الإتصال. @@ -2623,6 +2554,20 @@ 1 + + Info + معلومات + + 1 + + + + Success + تم بنجاح + + 1 + + Incorrect username or password. اسم المستخدم أو كلمة المرور خاطئة. @@ -2721,6 +2666,20 @@ 1 + + Email is required. + البريد الإلكتروني مطلوب. + + 1 + + + + Email must be valid. + يجب أن يكون عنوان البريد الإلكتروني عنوانًا صالحًا. + + 1 + + Username is required. اسم المستخدم مطلوب. @@ -2742,27 +2701,6 @@ 1 - - Username must be at least 3 characters long. - يجب أن يكون طول اسم المستخدِم أكبر مِن 3 أحرف. - - 1 - - - - Email is required. - البريد الإلكتروني مطلوب. - - 1 - - - - Email must be valid. - يجب أن يكون عنوان البريد الإلكتروني عنوانًا صالحًا. - - 1 - - User role is required. دور المستخدم مطلوب. @@ -2826,13 +2764,6 @@ 1 - - Name cannot be more than 20 characters long. - طول الاسم لا يجب أن يتجاوز 20 حرفا. - - 1 - - Comment is required. التعليق مطلوب. @@ -3288,13 +3219,6 @@ 1 - - Info - معلومات - - 1 - - Upload cancelled تم إلغاء الإرسال diff --git a/client/src/locale/target/angular_ca_ES.xml b/client/src/locale/target/angular_ca_ES.xml index 7444b71b0..15c1bbca0 100644 --- a/client/src/locale/target/angular_ca_ES.xml +++ b/client/src/locale/target/angular_ca_ES.xml @@ -116,7 +116,7 @@ Password Contrasenya - 12 + 13 @@ -130,7 +130,7 @@ Login Iniciar sessió - 38 + 36 @@ -158,7 +158,7 @@ Send me an email to reset my password Envia'm un correu per reiniciar la meva contrasenya - 75 + 80 @@ -215,7 +215,7 @@ Signup Registra't - 88 + 78 @@ -251,14 +251,14 @@ Change the language Canvia la llengua - 88 + 86 Create an account Registrar un compte - 39 + 37 @@ -272,35 +272,35 @@ Trending Tendència - 57 + 55 Recently added Afegits fa poc - 62 + 60 Local Local - 67 + 65 More Més - 72 + 70 Administration Administració - 76 + 74 @@ -412,7 +412,7 @@ No results. Sense resultats. - 17 + 20 @@ -429,15 +429,11 @@ 7 - - - About instance - - - Quant a la instància - + + Submit + Envia - 1 + 31 @@ -451,47 +447,14 @@ Terms Termes - 44 + 39 User registration is allowed and El registre d'usuaris és permès i - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - aquesta instància proporciona una quota bàsica de d''espai per els vídeos dels seus usuaris. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - aquesta instància proporciona espai il·limitat per els vídeos del seus usuaris. - - - 31 - - - - - User registration is currently not allowed. - - - El registre d'usuaris actualment no és permès. - - - 36 + 29 @@ -777,42 +740,42 @@ Short description Descripció curta - 22 + 21 Default client route Ruta per defecte del client - 55 + 48 Videos Trending Vídeos tendència - 59 + 52 Videos Recently Added Vídeos afegits fa poc - 60 + 53 Local videos Vídeos locals - 61 + 54 Policy on videos containing sensitive content Política sobre vídeos que contenen contingut sensible - 70 + 61 @@ -847,42 +810,42 @@ Signup enabled Registre activat - 93 + 84 Signup limit Limit de registres + + 96 + + + + Users + Usuaris 105 + + User default video quota + Quota de vídeo per defecte de l'usuari + + 109 + + Administrator Administrador - 131 + 155 Admin email Correu del Administrador - 134 - - - - Users - Usuaris - - 144 - - - - User default video quota - Quota de vídeo per defecte de l'usuari - - 147 + 158 @@ -903,21 +866,21 @@ Your Twitter username El teu nom d'usuari de Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica el compte de Twitter del lloc web o plataforma en què es va publicar el contingut. - 184 + 187 Instance whitelisted by Twitter Instància a la llista blanca de Twitter - 198 + 199 @@ -931,77 +894,77 @@ Transcoding Transcodificació - 210 + 215 Transcoding enabled Transcodificació activada - 215 + 221 If you disable transcoding, many videos from your users will not work! Si desactives la transcodificació, molts vídeos dels teus usuaris no funcionaran. - 216 + 222 Transcoding threads Subprocessos per la transcodificació - 223 + 237 Previews cache size Memòria cau per a visualitzacions prèvies - 254 + 271 Customizations Personalitzacions - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escriu directament el codi JavaScript.<br />Exemple: <pre>console.log('la meva instància és sorprenent');</pre> - 281 + 297 Advanced configuration Configuració avançada - 207 + 212 Update configuration Actualitza la configuració - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Sembla que la configuració no és vàlida. Cerca possibles errors a les diferents pestanyes. - 326 + 341 @@ -1254,20 +1217,6 @@ 7 - - My settings - La meva configuració - - 3 - - - - My videos - Els meus vídeos - - 14 - - Video quota: Quota de vídeo: @@ -1279,21 +1228,14 @@ Profile Perfil - 8 + 7 Video settings Ajustos de vídeo - 15 - - - - Submit - Envia - - 24 + 16 @@ -1485,14 +1427,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Publish will be available when upload is finished La publicació estarà disponible quan finalitzi la càrrega - 53 + 58 Publish Publica - 60 + 65 @@ -1548,7 +1490,7 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Wait transcoding before publishing the video Espera la transcodificació abans de publicar el vídeo - 130 + 131 @@ -1562,14 +1504,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Upload thumbnail Puja miniatura - 195 + 196 Upload preview Previsualitza la càrrega - 202 + 203 @@ -1583,14 +1525,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Short text to tell people how they can support you (membership platform...). Text breu per dir a la gent com us poden ajudar (plataforma de pertinença ...). - 209 + 210 Advanced settings Ajustos avançats - 190 + 191 @@ -1841,13 +1783,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 14 - - Error getting about from server - S'ha produït un error en obtenir quant a del servidor - - 1 - - No description Sense descripció @@ -1869,20 +1804,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Error - Error - - 1 - - - - Success - Èxit - - 1 - - Configuration updated. S'ha actualitzat la configuració. @@ -2044,23 +1965,16 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Estàs segur que vols eliminar ? També s''esborraràn tots els vídeos carregats en aquest canal. - - 1 - - - - Please type the name of the video channel to confirm - Escriu el nom del canal de vídeo per confirmar + + Video channel deleted. + Canal de vídeo eliminat. 1 - - Video channel deleted. - Canal de vídeo eliminat. + + My videos + Els meus vídeos 1 @@ -2121,6 +2035,13 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + My settings + La meva configuració + + 1 + + Unable to find user id or verification string. No es pot trobar l'identificador d'usuari ni la cadena de verificació. @@ -2144,6 +2065,13 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Error + Error + + 1 + + You need to reconnect. Necessites tornar a connectar. @@ -2158,6 +2086,20 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Info + Informació + + 1 + + + + Success + Èxit + + 1 + + Your password has been successfully reset! La contrasenya s'ha restablit correctament. @@ -2263,6 +2205,20 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Email is required. + Es requereix un correu electrònic. + + 1 + + + + Email must be valid. + El correu electrònic ha de ser vàlid. + + 1 + + Username is required. Es requereix nom d'usuari. @@ -2284,41 +2240,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Username must be at least 3 characters long. - El nom d'usuari ha de tenir com a mínim 3 caràcters. - - 1 - - - - Username cannot be more than 20 characters long. - El nom d'usuari no pot tenir més de 20 caràcters. - - 1 - - - - Username should be only lowercase alphanumeric characters. - El nom d'usuari ha de ser només caràcters alfanumèrics en minúscules. - - 1 - - - - Email is required. - Es requereix un correu electrònic. - - 1 - - - - Email must be valid. - El correu electrònic ha de ser vàlid. - - 1 - - Password must be at least 6 characters long. La contrasenya ha de tenir com a mínim 6 caràcters. @@ -2368,20 +2289,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Display name must be at least 3 characters long. - El nom de visualització ha de tenir un mínim de 3 caràcters. - - 1 - - - - Display name cannot be more than 120 characters long. - El nom de visualització no pot tenir més de 120 caràcters. - - 1 - - Description must be at least 3 characters long. La descripció ha de tenir almenys 3 caràcters de longitud. @@ -2403,13 +2310,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Report reason cannot be more than 300 characters long. - El motiu de l'informe no pot tenir més de 300 caràcters. - - 1 - - Support text must be at least 3 characters long. El text de suport ha de tenir un mínim de 3 caràcters. @@ -3054,13 +2954,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Info - Informació - - 1 - - Upload cancelled Pujada cancel·lada diff --git a/client/src/locale/target/angular_cs_CZ.xml b/client/src/locale/target/angular_cs_CZ.xml index 59af08639..7b6f99ddb 100644 --- a/client/src/locale/target/angular_cs_CZ.xml +++ b/client/src/locale/target/angular_cs_CZ.xml @@ -309,7 +309,8 @@ Unsubscribe -Přestat odebírat + Přestat odebírat + 18 @@ -337,14 +338,21 @@ Přestat odebírat Subscribe with a Mastodon account: - Odebírat přes Mastodon účet + Odebírat přes účet na Mastodonu: 43 + + Using a syndication feed + Použít syndikační proud + + 48 + + Subscribe via RSS - Odebírat RSS + Odebírat přes RSS 49 @@ -362,6 +370,20 @@ Přestat odebírat 10 + + You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there. + Tento kanál můžete odebírat z jakékoliv instance na fediverse používající ActivityPub. Například u Mastodonu nebo Pleromy můžete napsat URL adresu kanálu do vyhledávacího pole a tam začít odebírat. + + 17 + + + + You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there. + S tímto videem můžete interagovat z jakékoliv instance na fediverse používající ActivityPub. Například u Mastodonu nebo Pleromy můžete napsat aktuální URL adresu do vyhledávacího pole a odtamtud interagovat. + + 22 + + Video quota Limit na videa @@ -438,7 +460,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Username or email address - Uživatelské jméno nebo email + Uživatelské jméno nebo e-mail 15 @@ -476,7 +498,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Password Heslo - 12 + 13 @@ -490,7 +512,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Login Přihlásit - 38 + 36 @@ -502,23 +524,23 @@ Blokovaný uživatel se už nebude moci přihlásit. Email - Email + E-mail 8 Email address - Emailová adresa + E-mailová adresa 10 Send me an email to reset my password - Poslat email pro resetování hesla + Poslat e-mail pro resetování hesla - 75 + 80 @@ -589,7 +611,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Signup Registrovat - 88 + 78 @@ -659,7 +681,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Change the language Změnit jazyk - 88 + 86 @@ -670,7 +692,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Můj veřejný profil - 18 + 16 @@ -681,7 +703,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Můj účet - 22 + 20 @@ -692,7 +714,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Moje videa - 26 + 24 @@ -703,14 +725,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Odhlásit - 30 + 28 Create an account Vytvořit účet - 39 + 37 @@ -724,49 +746,49 @@ Blokovaný uživatel se už nebude moci přihlásit. Subscriptions Odběry - 47 + 45 Overview Přehled - 52 + 50 Trending Trendy - 57 + 55 Recently added Nedávno přidané - 62 + 60 Local Místní - 67 + 65 More Další - 72 + 70 Administration Administrace - 76 + 74 @@ -776,11 +798,18 @@ Blokovaný uživatel se už nebude moci přihlásit. 25 + + Show keyboard shortcuts + Zobrazit klávesové zkratky + + 89 + + Toggle dark interface Přepnout tmavé rozhraní - 94 + 92 @@ -811,6 +840,20 @@ Blokovaný uživatel se už nebude moci přihlásit. 15 + + Duration + Trvání + + 24 + + + + Display sensitive content + Zobrazit citlivý obsah + + 33 + + Yes Ano @@ -867,11 +910,18 @@ Blokovaný uživatel se už nebude moci přihlásit. 94 + + Display unlisted and private videos + Zobrazit neuvedená a soukromá videa + + 14 + + No results. Žádné výsledky. - 17 + 20 @@ -929,15 +979,11 @@ Blokovaný uživatel se už nebude moci přihlásit. 7 - - - About instance - - - O instanci - + + Submit + Odeslat - 1 + 31 @@ -951,47 +997,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Terms Podmínky - 44 + 39 User registration is allowed and Registrace uživatelů je povolena a - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - tato instance poskytuje základní limit místa pro videa svým uživatelům. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - tato instance poskytuje neomezený prostor pro videa svých uživatelů. - - - 31 - - - - - User registration is currently not allowed. - - - Registrace uživatelů není momentálně povolena. - - - 36 + 29 @@ -1126,6 +1139,21 @@ Blokovaný uživatel se už nebude moci přihlásit. 51 + + + Web peers are not publicly accessible: because we use WebRTC inside the web browser (with the WebTorrent library), the protocol is different from classic BitTorrent. + When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to. + See this document for more information + + + Webové peery nejsou veřejně dostupné: jelikož používáme WebRTC v prohlížeči (s knihovnou WebTorrent), je protokol odlišný od klasického BitTorrentu. + Když jste ve webovém prohlížeči, pošlete trackeru signál obsahující vaši IP adresu. Tracker pak náhodně vybere další peery, kterým přepošle informace. + Pro více informací si přečtěte tento dokument + + + 55 + + The worst-case scenario of an average person spying on their friends is quite unlikely. @@ -1141,7 +1169,7 @@ Blokovaný uživatel se už nebude moci přihlásit. How does PeerTube compare with YouTube? - Jaký e PeerTube v porovnání s YouTube? + Jaký je PeerTube v porovnání s YouTube? 67 @@ -1153,9 +1181,9 @@ Blokovaný uživatel se už nebude moci přihlásit. Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). - Ohrožení soukromí je na YouTube odlišné od toho na PeerTube. + Ohrožení soukromí je na YouTubu odlišné od toho na PeerTubu. V případě YouTube, tato služba o vás sbírá obrovské mnžoství osobních informací (nejen vaší IP adresu), aby je poté analyzovala a sledovala vás. - Kromě toho, YouTube je vlastněn Google/Alphabet, společností, která vás sleduje napříč různými webovými stránkami (přes AdSense nebo Google Analytics). + Kromě toho je YouTube vlastněn Googlem/Alphabetem, společností, která vás sleduje napříč různými webovými stránkami (přes AdSense nebo Google Analytics). 69 @@ -1190,6 +1218,19 @@ Blokovaný uživatel se už nebude moci přihlásit. 83 + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + + PeerTube je v rané fázi a chceme vám doručit ta nejlepší možná opatření, dokud nebude vydána stabilní verze. + Mezitím chceme vyzkoušet různé nápady spojené s tímto problémem: + + + 85 + + Set a limit to the number of peers sent by the tracker Nastavit limit počtu peerů odeslaných trackerem @@ -1225,6 +1266,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 95 + + Banned + Zablokován + + 12 + + subscribers odběratelů @@ -1278,42 +1326,49 @@ Blokovaný uživatel se už nebude moci přihlásit. Short description Krátký popis - 22 + 21 Default client route Výchozí hlavní stránka - 55 + 48 + + + + Videos Overview + Přehled videí + + 51 Videos Trending Trendy - 59 + 52 Videos Recently Added Naposledy přidaná videa - 60 + 53 Local videos Místní videa - 61 + 54 Policy on videos containing sensitive content Pravidla pro videa obsahující citlivý obsah - 70 + 61 @@ -1348,42 +1403,63 @@ Blokovaný uživatel se už nebude moci přihlásit. Signup enabled Povolit registrace - 93 + 84 + + + + Signup requires email verification + Registrace vyžaduje ověření e-mailem. + + 91 Signup limit Limit registrací + + 96 + + + + Users + Uživatelé 105 - - Administrator - Administrátor + + User default video quota + Výchozí limit na uživatele - 131 + 109 - - Admin email - Email administrátora + + Import + Import - 134 + 42 - - Users - Uživatelé + + Video import with HTTP URL (i.e. YouTube) enabled + Import videa pomocí URL HTTP (např. YouTube) povolen - 144 + 141 - - User default video quota - Výchozí limit na uživatele + + Administrator + Administrátor + + 155 + + + + Admin email + E-mail administrátora - 147 + 158 @@ -1404,21 +1480,21 @@ Blokovaný uživatel se už nebude moci přihlásit. Your Twitter username Váš účet na Twitteru - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Uveďte Twitter účet stránky nebo služby, na které byl obsah publikován. - 184 + 187 Instance whitelisted by Twitter Twitter povolil tuto instanci - 198 + 199 @@ -1432,77 +1508,99 @@ Blokovaný uživatel se už nebude moci přihlásit. Transcoding Překódování - 210 + 215 Transcoding enabled Překódování povoleno - 215 + 221 If you disable transcoding, many videos from your users will not work! Pokud zakážete překódování, mnoho videí od vašich uživatelů nebude fungovat! - 216 + 222 Transcoding threads Vlákna na překódování - 223 + 237 + + + + Resolution enabled + Rozlišení povoleno + + 252 + + + + + Cache + + + + + Mezipaměť + + + + + 260 Previews cache size Velikost mezipaměti náhledů - 254 + 271 Customizations Přizpůsobení - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Pište přímo JavaScript kód.<br />Například: <pre>console.log('moje instance je úžasná');</pre> - 281 + 297 Advanced configuration Pokročilá nastavení - 207 + 212 Update configuration Aktualizovat nastavení - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Zdá se, že vaše konfigurace není validní. Prosím, vyhledejte potencialní chyby v jiné záložce. - 326 + 341 @@ -1527,6 +1625,17 @@ Blokovaný uživatel se už nebude moci přihlásit. 7 + + + Moderation + + + Moderace + + + 11 + + Jobs @@ -1574,6 +1683,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 21 + + Filter... + Filtrovat... + + 27 + + ID ID @@ -1713,6 +1829,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 40 + + (banned) + (zablokován) + + 65 + + Go to the account page Přejít na stránku kanálu @@ -1720,6 +1843,31 @@ Blokovaný uživatel se už nebude moci přihlásit. 133 + + Ban reason: + Důvod zablokování: + + 95 + + + + + This comment can only be seen by you or the other moderators. + + + Tento komentář můžete vidět pouze vy nebo ostatní moderátoři. + + + 17 + + + + Update this comment + Aktualizovat tento komentář + + 25 + + Reporter Autor nahlášení @@ -1748,25 +1896,25 @@ Blokovaný uživatel se už nebude moci přihlásit. 33 - - Blacklisted videos - Videa na černé listině + + Actions + Akce - 7 + 35 - - My settings - Moje nastavení + + Reason: + Důvod: - 3 + 53 - - My videos - Moje videa + + Blacklisted videos + Videa na černé listině - 14 + 7 @@ -1780,21 +1928,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Profile Profil - 8 + 7 Video settings Nastavení videí - 15 - - - - Submit - Odeslat - - 24 + 16 @@ -1915,6 +2056,13 @@ When you will upload a video in this channel, the video support field will be au 27 + + subscribers + odběratelů + + 10 + + (extensions: , max size: ) (typ souboru: , maximální velikost: ) @@ -1986,14 +2134,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished Publikovat lze jakmile bude dokončeno nahrávání - 53 + 58 Publish Publikovat - 60 + 65 @@ -2005,11 +2153,18 @@ When you will upload a video in this channel, the video support field will be au Tags - Tagy + Štítky 191 + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Štítky mohou být použity pro navržení relevantních doporučení.</br>Stisknutím klávesy Enter přidáte nový štítek. + + 18 + + Video descriptions are truncated by default and require manual action to expand them. Popisy videí jsou ve výchozím stavu sbaleny a rozbalují se kliknutím. @@ -2049,7 +2204,7 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video Čekat na překódování před publikováním videa - 130 + 131 @@ -2063,14 +2218,14 @@ When you will upload a video in this channel, the video support field will be au Upload thumbnail Nahrát miniaturu - 195 + 196 Upload preview Nahrát náhled - 202 + 203 @@ -2084,14 +2239,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). Krátký text, co řekne lidem, jak vás mohou podpořit. - 209 + 210 Advanced settings Rozšířená nastavení - 190 + 191 @@ -2342,13 +2497,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - Chyba při získávání popisu - - 1 - - No description Žádný popis @@ -2370,20 +2518,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - Chyba - - 1 - - - - Success - Úspěšně - - 1 - - Configuration updated. Nastavení aktualizováno. @@ -2489,6 +2623,27 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unban + Odblokovat + + 1 + + + + Do you really want to unban users? + Opravdu chcete odblokovat uživatelů? + + 1 + + + + users unbanned. + uživatelů odblokováno. + + 1 + + You cannot delete root. Uživatel root nelze odstranit. @@ -2545,23 +2700,16 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Opravdu chcete odstranit ? Tato akce odstraní i veškerá videa na tomto kanálu. - - 1 - - - - Please type the name of the video channel to confirm - Prosím, napište název tohoto kanálu pro potvrzení + + Video channel deleted. + Video kanál odstraněn. 1 - - Video channel deleted. - Video kanál odstraněn. + + My videos + Moje videa 1 @@ -2622,6 +2770,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + My subscriptions + Moje odběry + + 1 + + + + My settings + Moje nastavení + + 1 + + Unable to find user id or verification string. Nelze najít uživatelovo id nebo verifikační řetězec. @@ -2629,6 +2791,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Subscribe to the account + Odebírat účet + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -2645,6 +2814,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + Chyba + + 1 + + You need to reconnect. Musíte se znovu připojit. @@ -2659,6 +2835,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + Info + + 1 + + + + Success + Úspěšně + + 1 + + Your password has been successfully reset! Vaše heslo bylo úspěšně resetováno! @@ -2745,14 +2935,14 @@ When you will upload a video in this channel, the video support field will be au Admin email is required. - Email administrátora je vyžadován. + E-mail administrátora je vyžadován. 1 Admin email must be valid. - Email administrátora musí být platný. + E-mail administrátora musí být platný. 1 @@ -2764,6 +2954,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + E-mail je vyžadován. + + 1 + + + + Email must be valid. + E-mail musí být platný. + + 1 + + Username is required. Uživatelské jméno je vyžadováno. @@ -2785,41 +2989,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - Uživatelské jméno musí mít délku minimálně 3 znaky. - - 1 - - - - Username cannot be more than 20 characters long. - Uživatelské jméno nemůže být delší než 20 znaků. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Uživatelské jméno by mělo obsahovat pouze malá písmena a číslice. - - 1 - - - - Email is required. - Email je vyžadován. - - 1 - - - - Email must be valid. - Email musí být platný. - - 1 - - Password must be at least 6 characters long. Heslo musí mít délku minimálně 6 znaků. @@ -2869,20 +3038,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - Zobrazované jméno musí mít delku minimálně 3 znaky. - - 1 - - - - Display name cannot be more than 120 characters long. - Zobrazované jméno nesmí být delší než 120 znaků. - - 1 - - Description must be at least 3 characters long. Popis musí mít délku minimálně 3 znaky. @@ -2904,13 +3059,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - Důvod nahlášení nesmí být delší než 300 znaků. - - 1 - - Support text must be at least 3 characters long. Text pro podporu musí mít délku minimálně 3 znaky. @@ -3506,6 +3654,34 @@ When you will upload a video in this channel, the video support field will be au 1 + + users banned. + uživatelů zablokováno. + + 1 + + + + User banned. + Uživatel zablokován. + + 1 + + + + Do you really want to unban ? + Opravdu chcete odblokovat uživatele ? + + 1 + + + + User unbanned. + Uživatel odblokován. + + 1 + + User deleted. Uživatel odstraněn. @@ -3541,16 +3717,51 @@ When you will upload a video in this channel, the video support field will be au 1 + + Subscribed to + Odebíráte kanál + + 1 + + Subscribed - Odebírám + Odebíráte + + 1 + + + + Unsubscribed from + Již neodebíráte kanál + + 1 + + + + Unsubscribed + Odběr zrušen + + 1 + + + + Anyone can see this video + Kdokoliv může vidět toto video + + 1 + + + + You are now logged in as ! + Nyní jste přihlášen/a jako ! 1 But associated data (tags, description...) will be lost, are you sure you want to leave this page? - Přiřazená data (tagy, popis...) budou ztraceny, opravdu chcete opustit tuto stránku? + Ovšem přidružená data (štítky, popis...) budou ztraceny, opravdu chcete opustit tuto stránku? 1 @@ -3562,13 +3773,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - Info - - 1 - - Upload cancelled Nahrávání zrušeno @@ -3611,6 +3815,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Like the video + To se mi líbí + + 1 + + + + Dislike the video + To se mi nelíbí + + 1 + + Do you really want to delete this video? Opravdu chcete odstranit toto video? @@ -3620,7 +3838,7 @@ When you will upload a video in this channel, the video support field will be au likes / dislikes - se to líbí / se to nelíbí + se to líbí / lidem se to nelíbí 1 @@ -3639,5 +3857,12 @@ When you will upload a video in this channel, the video support field will be au 1 + + Videos from your subscriptions + Videa od vašich odběrů + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_de_DE.xml b/client/src/locale/target/angular_de_DE.xml index 46e622908..39610dfdb 100644 --- a/client/src/locale/target/angular_de_DE.xml +++ b/client/src/locale/target/angular_de_DE.xml @@ -499,7 +499,7 @@ Password Passwort - 12 + 13 @@ -513,7 +513,7 @@ Login Anmelden - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password Mir eine E-Mail schicken, um mein Passwort zurückzusetzen - 75 + 80 @@ -600,11 +600,18 @@ Konto erstellen 17 + + I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance + Ich bin mindestens 16 Jahre alt und stimme den <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Bestimmungen</a> dieser Instanz zu + + 55 + + Signup Registrieren - 88 + 78 @@ -632,6 +639,19 @@ Konto erstellen 6 + + + Filters + + + + Filter + + + + 16 + + No results found @@ -661,7 +681,7 @@ Konto erstellen Change the language Sprache wechseln - 88 + 86 @@ -672,7 +692,7 @@ Konto erstellen Mein öffentliches Profil - 18 + 16 @@ -683,7 +703,7 @@ Konto erstellen Mein Konto - 22 + 20 @@ -694,7 +714,7 @@ Konto erstellen Meine Videos - 26 + 24 @@ -705,14 +725,14 @@ Konto erstellen Abmelden - 30 + 28 Create an account Konto erstellen - 39 + 37 @@ -726,49 +746,49 @@ Konto erstellen Subscriptions Abos - 47 + 45 Overview Übersicht - 52 + 50 Trending Beliebt - 57 + 55 Recently added Kürzlich hinzugefügt - 62 + 60 Local Lokal - 67 + 65 More Mehr - 72 + 70 Administration Administration - 76 + 74 @@ -782,14 +802,14 @@ Konto erstellen Show keyboard shortcuts Zeige Tastatur-Kürzel - 91 + 89 Toggle dark interface Dunkle Oberfläche umschalten - 94 + 92 @@ -894,14 +914,14 @@ Konto erstellen Display unlisted and private videos Private und nicht gelisteten Videos aufzeigen - 11 + 14 No results. Keine Ergebnisse. - 17 + 20 @@ -959,15 +979,22 @@ Konto erstellen 7 - + - About instance - + Cancel + - Über die Instanz - + Abbrechen + - 1 + 26 + + + + Submit + Abschicken + + 31 @@ -981,47 +1008,14 @@ Konto erstellen Terms Bestimmungen - 44 + 39 User registration is allowed and Benutzerregistrierung ist möglich und - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - für die Videos ihrer Nutzer stellt diese Instanz einen Speicherplatz von zur Verfügung. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - für die Videos ihrer Nutzer stellt diese Instanz unbegrenzten Speicherplatz zur Verfügung. - - - 31 - - - - - User registration is currently not allowed. - - - Die Benutzerregistrierung ist zur Zeit nicht erlaubt. - - - 36 + 29 @@ -1037,7 +1031,7 @@ Konto erstellen PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser. - PeerTube ist eine föderierte Videostreamingplattform basierend auf dem ActivityPub-Protokoll, die mit WebTorrent P2P-Technologie direkt im Browser verwendet. + PeerTube ist eine föderierte Videostreamingplattform basierend auf dem ActivityPub-Protokoll, die WebTorrent P2P-Technologie direkt im Browser verwendet. 6 @@ -1242,6 +1236,19 @@ Konto erstellen 83 + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + + PeerTube ist in der frühen Entwicklungsphase und es ist geplant, die besten Gegenmaßnahmen in der nächsten stabilen Version zu implementieren. + Bis dahin wollen wir verschiedene Ideen für dieses Problem testen: + + + 85 + + Set a limit to the number of peers sent by the tracker Die Zahl der Peers, die durch einen Tracker gesendet wird, begrenzen. @@ -1278,27 +1285,37 @@ Konto erstellen - BannedBanned + Banned + Gebannt + 12 - MutedMuted + Muted + Stummgeschaltet + 13 - Muted by your instanceMuted by your instance + Muted by your instance + Von deiner Instanz stummgeschaltet + 14 - Instance mutedInstance muted + Instance muted + Instanz stummgeschaltet + 15 - Instance muted by your instanceInstance muted by your instance + Instance muted by your instance + Diese Instanz wurde deiner Instanz stummgeschaltet + 16 @@ -1355,49 +1372,49 @@ Konto erstellen Short description Kurze Beschreibung - 22 + 21 Default client route Standardpfad (Client) - 55 + 48 Videos Overview Video-Übersicht - 58 + 51 Videos Trending Beliebte Videos - 59 + 52 Videos Recently Added Kürzlich hinzugefügte Videos - 60 + 53 Local videos Lokale Videos - 61 + 54 Policy on videos containing sensitive content Verhalten bei Videos mit anstößigen Inhalten - 70 + 61 @@ -1432,23 +1449,44 @@ Konto erstellen Signup enabled Registrierung aktiviert - 93 + 84 Signup requires email verification Registrierung erfordert eine Bestätigung der E-Mail-Adresse - 100 + 91 Signup limit Obergrenze für Registrierungen + + 96 + + + + Users + Benutzer 105 + + User default video quota + Standardkontingent für die Videos eines Nutzers + + 109 + + + + User default daily upload limit + Tägliches Obergrenze eines Nutzers beim Hochladen + + 121 + + Import Importieren @@ -1460,49 +1498,28 @@ Konto erstellen Video import with HTTP URL (i.e. YouTube) enabled Video durch HTTP URL (z.b. YouTube©) import erlaubt. - 120 + 141 Video import with a torrent file or a magnet URI enabled Video-Import über eine Torrent-Datei oder einen Magnet-Link aktiviert - 127 + 148 Administrator Administrator - 131 + 155 Admin email Admin E-Mail - 134 - - - - Users - Benutzer - - 144 - - - - User default video quota - Standardkontingent für die Videos eines Nutzers - - 147 - - - - User default daily upload limit - Tägliches Obergrenze eines Nutzers beim Hochladen - - 161 + 158 @@ -1523,21 +1540,21 @@ Konto erstellen Your Twitter username Dein Twitter-Benutzername - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Zeigt den Twitter-Account für die Webseite, auf der der Inhalt veröffentlicht wurde. - 184 + 187 Instance whitelisted by Twitter Instanz von Twitter vertraut - 198 + 199 @@ -1551,35 +1568,35 @@ Konto erstellen Transcoding Transkodierung - 210 + 215 Transcoding enabled Transkodierung an - 215 + 221 If you disable transcoding, many videos from your users will not work! Wenn du die Transkodierung abschaltest, werden viele Videos nicht laufen! - 216 + 222 Transcoding threads Transcodierungsthreads - 223 + 237 Resolution enabled Eingestellte Auflösung: - 239 + 252 @@ -1594,82 +1611,47 @@ Konto erstellen - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Einige Dateien (Vorschau, Untertitel) werden nicht verteilt gespeichert. Wir laden sie direkt von der Ursprungsinstanz und speichern sie zwischen. - 249 + 265 Previews cache size Cachegröße der Vorschau - 254 + 271 Video captions cache size Cachegröße der Untertitel - 265 + 280 Customizations Personalisierung - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Füge dein JavaScript ein.<br />Beispiel: <pre>console.log('Meine Instanz ist großartig');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Schreibe direkt CSS-Code. Beispiel:<br /> - <pre> - body - background-color: red; - - </pre> - - Stelle <em>#custom-css</em> voran, um den Stil zu überschreiben. Beispiel: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1678,21 +1660,21 @@ Konto erstellen Advanced configuration Erweiterte Einstellungen - 207 + 212 Update configuration Einstellungen aktualisieren - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Die Einstellungen sind anscheinend ungültig. Bitte suche nach potentiellen Fehlern in den verschiedenen Reitern. - 326 + 341 @@ -1963,7 +1945,9 @@ Konto erstellen - (banned)(banned) + (banned) + (gebannt) + 65 @@ -1974,11 +1958,25 @@ Konto erstellen 133 + + User's email must be verified to login + Die E-Mail-Adresse des Nutzers muss vor dem Einloggen bestätigt werden + + 72 + + + + User's email is verified / User can login without email verification + Die E-Mail-Addresse des Nutzers wurde bestätigt / Nutzer kann ohne E-Mail-Bestätigung einloggen + + 76 + + Ban reason: Grund für die Sperrung: - 92 + 95 @@ -2045,7 +2043,7 @@ Konto erstellen Actions Aktionen - 33 + 35 @@ -2080,14 +2078,14 @@ Konto erstellen Date Datum - 10 + 11 Blacklist reason: Grund für die Sperre: - 41 + 43 @@ -2112,12 +2110,16 @@ Konto erstellen - Muted accountsMuted accounts + Muted accounts + Stummgeschaltete Accounts + 2 - Muted serversMuted servers + Muted servers + Stummgeschaltete Server + 11 @@ -2129,109 +2131,59 @@ Konto erstellen - Muted at Muted at + Muted at + Stummgeschaltet am + 13 - UnmuteUnmute + Unmute + Stummschalten aufheben + 23 - - My settings - Meine Einstellungen + + Video quota: + Videokontingent: - 3 + 4 - - My library - Meine Bibliothek + + Profile + Profil 7 - - My channels - Meine Kanäle + + Video settings + Videoeinstellungen - 12 + 16 - - My videos - Meine Videos + + Danger zone + Gefahrenzone - 14 + 19 - - My subscriptions - Meine Abos + + Change ownership + Besitzer ändern - 16 + 46 - - My imports - Meine Importe + + Select the next owner + Wähle den nächsten Besitzer - 18 - - - - Muted instancesMuted instances - 2 - - - - Ownership changes - Besitzer ändern - - 33 - - - - Video quota: - Videokontingent: - - 4 - - - - Profile - Profil - - 8 - - - - Video settings - Videoeinstellungen - - 15 - - - - Danger zone - Gefahrenzone - - 18 - - - - Change ownership - Besitzer ändern - - 46 - - - - Select the next owner - Wähle den nächsten Besitzer - - 9 + 9 @@ -2245,13 +2197,6 @@ Konto erstellen 35 - - Submit - Abschicken - - 24 - - - views - Aufrufe @@ -2411,6 +2356,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 47 + + Muted instances + Stummgeschaltete Instanzen + + 2 + + Change password Passwort ändern @@ -2616,6 +2568,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 159 + + Sorry, but something went wrong + Entschuldigung, etwas ist schiefgegangen + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2652,14 +2611,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Publish will be available when upload is finished Veröffentlichung ist möglich, sobald das Hochladen abgeschlossen ist - 53 + 58 Publish Veröffentlichen - 60 + 65 @@ -2842,14 +2801,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Wait transcoding before publishing the video Transkodieren abwarten, bevor das Video veröffentlicht wird - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Wenn du dich entschließt, das Transkodieren nicht abzuwarten, kann das Video unabspielbar sein, bis das Transkodieren beendet ist. - 131 + 132 @@ -2863,49 +2822,49 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Add another caption Weitere Untertitel hinzufügen - 146 + 147 See the subtitle file Siehe in der Untertiteldatei - 155 + 156 Already uploaded ✔ Fast hochgeladen ✔ - 159 + 160 Will be created on update Wird bei einer Aktualisierung erstellt - 167 + 168 Cancel create Erstellen abbrechen - 169 + 170 Will be deleted on update Wird bei einer Aktualisierung gelöscht - 175 + 176 Cancel deletion Löschen abbrechen - 177 + 178 @@ -2916,28 +2875,28 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Bis auf Weiteres keine Untertitel. - 182 + 183 Captions Untertitel - 139 + 140 Upload thumbnail Miniaturansicht hochladen - 195 + 196 Upload preview Vorschau hochladen - 202 + 203 @@ -2951,14 +2910,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Short text to tell people how they can support you (membership platform...). Ein kurzer Text, der anderen erklärt, wie sie dich unterstützen können. - 209 + 210 Advanced settings Erweiterte Einstellungen - 190 + 191 @@ -3025,17 +2984,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 3 - - - Cancel - - - Abbrechen - - - 19 - - Share Teilen @@ -3422,13 +3370,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 14 - - Error getting about from server - Server-Fehler. - - 1 - - No description Keine Beschreibung @@ -3450,13 +3391,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Error - Fehler - - 1 - - 240p 240p @@ -3499,13 +3433,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Success - Erfolg - - 1 - - Configuration updated. Einstellungen aktualisiert. @@ -3668,7 +3595,16 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa - Account unmuted by your instance.Account unmuted by your instance. + Account unmuted by your instance. + Account ist von deiner Instanz nicht mehr stummgeschatet. + + 1 + + + + Instance unmuted by your instance. + Instance ist von deiner Instanz nicht mehr stummgeschaltet. + 1 @@ -3679,6 +3615,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Delete this report + Missbrauchsmeldung löschen + + 1 + + Update moderation comment Moderationskommentar aktualisieren @@ -3700,6 +3643,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Do you really want to delete this abuse report? + Wollen Sie wirklich diese Missbrauchsmeldung löschen? + + 1 + + Abuse deleted. Missbrauchsmeldung gelöscht. @@ -3749,6 +3699,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Set Email as Verified + E-Mail als bestätigt setzen + + 1 + + You cannot ban root. Du kannst root nicht sperren. @@ -3756,6 +3713,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Do you really want to unban users? + Willst du wirklich den Bann von Benutzern aufheben? + + 1 + + + + users unbanned. + Bann von Benutzern aufgehoben. + + 1 + + You cannot delete root. Du kannst die Wurzel nicht löschen. @@ -3764,7 +3735,37 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa - If you remove these users, you will not be able to create others with the same username!If you remove these users, you will not be able to create others with the same username! + If you remove these users, you will not be able to create others with the same username! + Wenn du diesen Benutzer löschst, kannst du keine neuen Benutzer mit gleichem Benutzernamen einrichten ! + + 1 + + + + users deleted. + Benutzer gelöscht. + + 1 + + + + users email set as verified. + E-Mail von Benutzern als bestätigt markiert. + + 1 + + + + Account unmuted. + Stummschaltung von Account aufgehoben. + + 1 + + + + Instance unmuted. + Stummschaltung von Instanz aufgehoben. + 1 @@ -3845,6 +3846,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + This name already exists on this instance. + Dieser Name existiert bereits auf dieser Instanz. + + 1 + + Create Erstellen @@ -3859,23 +3867,16 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Willst du wirklich löschen? Alle hochgeladenen Videos des Kanals werden dann ebenfalls unwiderruflich gelöscht. - - 1 - - - - Please type the name of the video channel to confirm - Bitte gib zur Bestätigung den Namen des Videokanals ein + + Video channel deleted. + Videokanal entfernt. 1 - - Video channel deleted. - Videokanal entfernt. + + My videos + Meine Videos 1 @@ -3950,16 +3951,44 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Channels - Kanäle + + My library + Meine Bibliothek + + 1 + + + + My channels + Meine Kanäle + + 1 + + + + My subscriptions + Meine Abos + + 1 + + + + Misc + Verschiedenes 1 - - Video imports - Video-Importe + + Ownership changes + Besitzer ändern + + 1 + + + + My settings + Meine Einstellungen 1 @@ -3979,7 +4008,23 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa - Subscribe to the accountSubscribe to the account + Subscribe to the account + Diesen Account abonnieren + + 1 + + + + Focus the search bar + Die Suchleiste fokussieren + + 1 + + + + Toggle the left menu + Linkes Menü umschalten + 1 @@ -4018,6 +4063,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Toggle Dark theme + Dunkles Theme umschalten + + 1 + + + + Go to my subscriptions + Gehe zu meinen Abos + + 1 + + Go to my videos zur meine Videos gehen @@ -4025,6 +4084,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Go to my imports + Gehe zu meinen Importen + + 1 + + + + Go to my channels + Gehe zu meinen Kanälen + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -4041,6 +4114,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Error + Fehler + + 1 + + You need to reconnect. Bitte verbinde dich erneut. @@ -4062,6 +4142,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Info + Infos + + 1 + + + + Success + Erfolg + + 1 + + Incorrect username or password. Falscher Benutzername oder falsches Passwort. @@ -4279,6 +4373,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Email is required. + Bitte gib eine E-Mail-Adresse ein. + + 1 + + + + Email must be valid. + Bitte gebe eine gültige E-Mail-Adresse ein. + + 1 + + Username is required. Bitte gib einen Benutzernamen ein. @@ -4300,41 +4408,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Username must be at least 3 characters long. - Der Benutzername muss mindestens 3 Zeichen lang sein. - - 1 - - - - Username cannot be more than 20 characters long. - Der Benutzername darf nicht länger als 20 Zeichen lang sein. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Der Benutzername sollte nur kleine alphanumerische Zeichen enthalten. - - 1 - - - - Email is required. - Bitte gib eine E-Mail-Adresse ein. - - 1 - - - - Email must be valid. - Bitte gebe eine gültige E-Mail-Adresse ein. - - 1 - - Password must be at least 6 characters long. Das Passwort muss mindestens 6 Zeichen lang sein. @@ -4398,23 +4471,16 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Display name must be at least 3 characters long. - Der Anzeigename muss mindestens 3 Zeichen lang sein. - - 1 - - - - Display name cannot be more than 120 characters long. - Der Anzeigename darf nicht länger als 120 Zeichen lang sein. + + Description must be at least 3 characters long. + Die Beschreibung muss mindestens 3 Zeichen umfassen. 1 - - Description must be at least 3 characters long. - Die Beschreibung muss mindestens 3 Zeichen umfassen. + + Description cannot be more than 1000 characters long. + Beschreibung kann nicht länger als 1000 Zeichen sein. 1 @@ -4454,13 +4520,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Report reason cannot be more than 300 characters long. - Der Grund für die Meldung darf nicht mehr als 300 Zeichen umfassen. - - 1 - - Moderation comment is required. Der Moderationskommentar muss angegeben werden. @@ -4475,13 +4534,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Moderation comment cannot be more than 300 characters long. - Der Moderationskommentar darf nicht mehr als 300 Zeichen umfassen. - - 1 - - The channel is required. Der Kanal muss angegeben werden. @@ -4524,37 +4576,30 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Name is required. - Der Name muss angegeben werden. - - 1 - - - - Name must be at least 3 characters long. - Der Name muss mindestens 3 Zeichen umfassen. + + You can only transfer ownership to a local account + Du kannst den Besitz nur auf einen lokalen Account übertragen 1 - - Name cannot be more than 20 characters long. - Der Name darf nicht mehr als 20 Zeichen umfassen. + + Name is required. + Der Name muss angegeben werden. 1 - - Name should be only lowercase alphanumeric characters. - Der Name sollte nur kleine alphanumerische Zeichen enthalten. + + Support text must be at least 3 characters long. + Die Beschreibung zur Unterstützung muss mindestens 3 Zeichen umfassen. 1 - - Support text must be at least 3 characters long. - Die Beschreibung zur Unterstützung muss mindestens 3 Zeichen umfassen. + + Support text cannot be more than 1000 characters long. + Die Beschreibung zur Unterstützung kann nicht mehr als 1000 Zeichen lang sein. 1 @@ -4650,6 +4695,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Video support cannot be more than 1000 characters long. + Die Beschreibung zur Unterstützung darf nicht mehr als 1000 Zeichen umfassen. + + 1 + + A date is required to schedule video update. Bitte gib ein ein Datum für die geplante Veröffentlichung ein. @@ -5175,6 +5227,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + users banned. + Benutzer gebannt. + + 1 + + User banned. Benutzer gesperrt. @@ -5210,6 +5269,111 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + User email set as verified + E-Mail des Benutzers als bestätigt markiert + + 1 + + + + Account muted. + Account stummgeschaltet. + + 1 + + + + Instance muted. + Instanz stummgeschaltet. + + 1 + + + + Account muted by the instance. + Account von der Instanz stummgeschaltet. + + 1 + + + + Account unmuted by the instance. + Account nicht mehr von der Instanz stummgeschaltet. + + 1 + + + + Instance muted by the instance. + Instanz von der Instanz stummgeschaltet. + + 1 + + + + Instance unmuted by the instance. + Instance nicht mehr von der Instanz stummgeschaltet. + + 1 + + + + Mute this account + Dieses Konto stummschalten + + 1 + + + + Unmute this account + Stummschaltung für dieses Konto aufheben + + 1 + + + + Mute the instance + Diese Instanz stummschalten + + 1 + + + + Unmute the instance + Stummschaltung für diese Instanz aufheben + + 1 + + + + Mute this account by your instance + Dieses Konto durch deine Instanz stummschalten lassen + + 1 + + + + Unmute this account by your instance + Stummschaltung dieses Kontos durch deine Instanz aufheben + + 1 + + + + Mute the instance by your instance + Diese Instanz durch deine Instanz stummschalten lassen + + 1 + + + + Unmute the instance by your instance + Stummschaltung dieser Instanz durch deine Instanz aufheben + + 1 + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. Die Anfrage ist zu groß. Bitte kontaktiere den Administrator, um die Obergrenze für die Größe zu erhöhen. @@ -5238,13 +5402,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Subscribed - Abonniert - - 1 - - Subscribed to abonniert @@ -5252,9 +5409,9 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Unsubscribed - Abo beendet + + Subscribed + Abonniert 1 @@ -5266,6 +5423,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Unsubscribed + Abo beendet + + 1 + + Moderator Moderator @@ -5294,6 +5458,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Wilkommen! Bitte überprüfe deine Mails um dein Benutzerkonto zu bestätigen und die Registrierung abzuschließen. + + 1 + + + + You are now logged in as ! + Du bist jetzt eingeloggt als ! + + 1 + + Video to import updated. Zu importierendes Video wurde aktualisiert. @@ -5322,13 +5500,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Info - Infos - - 1 - - Upload cancelled Hochladen abgebrochen @@ -5336,13 +5507,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Leider kann PeerTube keine Videos verarbeiten, die größer als 8 GB sind. - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Dein Videokontingent wird mit diesem Video überschritten (Videogröße: , benutzt: , Kontingent: ) diff --git a/client/src/locale/target/angular_eo.xml b/client/src/locale/target/angular_eo.xml index faa52fbdb..0d54b5a5d 100644 --- a/client/src/locale/target/angular_eo.xml +++ b/client/src/locale/target/angular_eo.xml @@ -236,7 +236,7 @@ Password Pasvorto - 12 + 13 @@ -250,7 +250,7 @@ Login Saluti - 38 + 36 @@ -278,7 +278,7 @@ Send me an email to reset my password Sendu al mi retleteron por restarigi mian pasvorton - 75 + 80 @@ -335,7 +335,7 @@ Signup Registriĝo - 88 + 78 @@ -371,7 +371,7 @@ Change the language Ŝanĝi la lingvon - 88 + 86 @@ -382,7 +382,7 @@ Miaj filmoj - 26 + 24 @@ -393,14 +393,14 @@ Adiaŭi - 30 + 28 Create an account Krei konton - 39 + 37 @@ -414,49 +414,49 @@ Subscriptions Abonoj - 47 + 45 Overview Superrigardo - 52 + 50 Trending Furoraj - 57 + 55 Recently added Freŝe aldonitaj - 62 + 60 Local Lokaj - 67 + 65 More Pli - 72 + 70 Administration Administrado - 76 + 74 @@ -568,7 +568,7 @@ No results. Nenio troviĝis. - 17 + 20 @@ -585,15 +585,11 @@ 7 - - - About instance - - - Pri la nodo «  » - + + Submit + Sendi - 1 + 31 @@ -607,47 +603,14 @@ Terms Kondiĉoj - 44 + 39 User registration is allowed and Registrado de uzantoj estas permesata kaj - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - ĉi tiu nodo donas bazan datumlimon de da spaco por filmoj de siaj uzantoj. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - ĉi tiu nodo donas senliman spacon por filmoj de siaj uzantoj. - - - 31 - - - - - User registration is currently not allowed. - - - Registrado de novaj uzantoj nun ne estas permesata. - - - 36 + 29 @@ -956,49 +919,49 @@ Short description Mallonga priskribo - 22 + 21 Default client route Norma klienta vojo - 55 + 48 Videos Overview Filma superrigardo - 58 + 51 Videos Trending Filmoj furoraj - 59 + 52 Videos Recently Added Filmoj freŝe aldonitaj - 60 + 53 Local videos Filmoj lokaj - 61 + 54 Policy on videos containing sensitive content Politiko pri filmoj kun konsterna enhavo - 70 + 61 @@ -1033,23 +996,37 @@ Signup enabled Registriĝoj ŝaltitaj - 93 + 84 Signup requires email verification Registriĝo bezonas kontrolon de retpoŝtadreso - 100 + 91 Signup limit Limo de registriĝoj + + 96 + + + + Users + Uzantoj 105 + + User default video quota + Norma datumlimo por filmoj de uzantoj + + 109 + + Import Enporti @@ -1061,35 +1038,21 @@ Video import with a torrent file or a magnet URI enabled Enporto de filmoj per torenta dosiero aŭ magneta ligilo ŝaltita - 127 + 148 Administrator Administranto - 131 + 155 Admin email Retpoŝtadreso de administranto - 134 - - - - Users - Uzantoj - - 144 - - - - User default video quota - Norma datumlimo por filmoj de uzantoj - - 147 + 158 @@ -1110,21 +1073,21 @@ Your Twitter username Via Tvitera salutnomo - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indikas konton de Twitter por la retejo aŭ platformo, sur kiu la afero publikiĝis. - 184 + 187 Instance whitelisted by Twitter Nodo permesata de Twitter - 198 + 199 @@ -1138,98 +1101,98 @@ Transcoding Transkodado - 210 + 215 Transcoding enabled Transkodado ŝaltita - 215 + 221 If you disable transcoding, many videos from your users will not work! Se vi malŝaltos transkodadon, multaj filmoj de viaj uzantoj eble ne funkcios! - 216 + 222 Transcoding threads Fadenoj por transkodado - 223 + 237 Resolution enabled Distingo ŝaltita - 239 + 252 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Iuj dosieroj ne estas federataj (antaŭrigardoj, transskriboj). Ni prenas kaj kaŝmemoras ilin rekte el la fonta nodo. - 249 + 265 Previews cache size Grando de antaŭrigarda kaŝmemoro - 254 + 271 Video captions cache size Grandeco de kaŝmemoro por filmaj transskriboj. - 265 + 280 Customizations Adaptoj - 275 + 289 JavaScript Ĝavoskripto - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Skribu rekte Ĝavoskriptan kodon.<br />Ekzemple: <pre>console.log('mia nodo bonegas');</pre> - 281 + 297 Advanced configuration Specialaj agordoj - 207 + 212 Update configuration Efektivigi agordojn - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Ŝajnas, ke la agordo estas nevalida. Bonvolu serĉi eblajn erarojn en la langetoj. - 326 + 341 @@ -1496,41 +1459,6 @@ 7 - - My settings - Miaj agordoj - - 3 - - - - My channels - Miaj kanaloj - - 12 - - - - My videos - Miaj filmoj - - 14 - - - - My subscriptions - Miaj abonoj - - 16 - - - - My imports - Miaj enportoj - - 18 - - Video quota: Datumlimo por filmoj: @@ -1542,28 +1470,21 @@ Profile Profilo - 8 + 7 Video settings Filmaj agordoj: - 15 + 16 Danger zone Danĝera areo - 18 - - - - Submit - Sendi - - 24 + 19 @@ -1801,14 +1722,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Publish will be available when upload is finished Eldono eblos post fino de alŝuto - 53 + 58 Publish Eldoni - 60 + 65 @@ -1952,14 +1873,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Wait transcoding before publishing the video Atendi transkodadon antaŭ publikigi la filmon - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se vi decidos ne atendi finon de transkodado antaŭ publikigo, ĝi povus esti neludebla ĝis la transkodo finiĝos. - 131 + 132 @@ -1973,49 +1894,49 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Add another caption Aldoni alian transskribon - 146 + 147 See the subtitle file Rigardi la dosieron kun subtekstoj - 155 + 156 Cancel create Nuligi kreon - 169 + 170 Cancel deletion Nuligi forigon - 177 + 178 Captions Transskriboj - 139 + 140 Upload thumbnail Alŝuti miniaturon - 195 + 196 Upload preview Alŝuti antaŭrigardon - 202 + 203 @@ -2029,14 +1950,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Short text to tell people how they can support you (membership platform...). Mallonga teksto por sciigi homojn, kiel ili povas subteni vin. - 209 + 210 Advanced settings Specialaj agordoj - 190 + 191 @@ -2319,13 +2240,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 14 - - Error getting about from server - Eraro ricevante prion de la servilo - - 1 - - No description Neniu priskribo @@ -2347,20 +2261,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Error - Eraro - - 1 - - - - Success - Sukceso - - 1 - - Configuration updated. Agordo ĝisdatigita @@ -2550,23 +2450,16 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Ĉu vi certe volas forigi kanalon ? Tiel vi ankaŭ forigos ĉiujn filmojn alŝutitajn al tiu ĉi kanalo. - - 1 - - - - Please type the name of the video channel to confirm - Bonvolu tajpi nomon de la filma kanalo por konfirmi + + Video channel deleted. + Filma kanalo forigita. 1 - - Video channel deleted. - Filma kanalo forigita. + + My videos + Miaj filmoj 1 @@ -2627,6 +2520,27 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + My channels + Miaj kanaloj + + 1 + + + + My subscriptions + Miaj abonoj + + 1 + + + + My settings + Miaj agordoj + + 1 + + Unable to find user id or verification string. Ne povas trovi identigilon aŭ kontrolan ĉenon de uzanto @@ -2650,6 +2564,13 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Error + Eraro + + 1 + + You need to reconnect. Vi devas rekonektiĝi @@ -2664,6 +2585,20 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Info + Informoj + + 1 + + + + Success + Sukceso + + 1 + + An email with the reset password instructions will be sent to . Retletero kun instrukcioj por restarigi la pasvorton sendiĝos al . @@ -2860,6 +2795,20 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Email is required. + Necesas retpoŝtadreso. + + 1 + + + + Email must be valid. + Retpoŝtadreso devas esti valida. + + 1 + + Username is required. Necesas salutnomo. @@ -2881,41 +2830,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Username must be at least 3 characters long. - Salutnomo devas havi almenaŭ 3 signojn. - - 1 - - - - Username cannot be more than 20 characters long. - Salutnomo ne povas havi pli ol 20 signojn. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Salutnomo havu nur ciferojn kaj minusklajn literojn. - - 1 - - - - Email is required. - Necesas retpoŝtadreso. - - 1 - - - - Email must be valid. - Retpoŝtadreso devas esti valida. - - 1 - - Password must be at least 6 characters long. Pasvorto devas havi almenaŭ 6 signojn. @@ -2965,20 +2879,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Display name must be at least 3 characters long. - Prezenta nomo devas havi almenaŭ 3 signojn. - - 1 - - - - Display name cannot be more than 120 characters long. - Prezenta nomo ne povas havi pli ol 120 signojn. - - 1 - - Description must be at least 3 characters long. Priskribo havu almenaŭ 3 signojn. @@ -3007,13 +2907,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Report reason cannot be more than 300 characters long. - Kialo de raporto maldevas havi pli ol 300 signojn. - - 1 - - Video caption language is required. Necesas lingvo de filma transskribo. @@ -3686,13 +3579,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Info - Informoj - - 1 - - Upload cancelled Alŝuto nuligita. @@ -3700,13 +3586,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Pardonu nin, sed PeerTube ne kapablas trakti filmojn super 8GB - - 1 - - Video published. Filmo publikigita. diff --git a/client/src/locale/target/angular_es_ES.xml b/client/src/locale/target/angular_es_ES.xml index 947c9a91d..828de2a57 100644 --- a/client/src/locale/target/angular_es_ES.xml +++ b/client/src/locale/target/angular_es_ES.xml @@ -5,7 +5,7 @@ Close - Cerrar + tppCerrar 2 @@ -227,6 +227,155 @@ 11 + + You don't have notifications. + No tiene notificaciones + + 1 + + + + + published a new video + + + ha publicado un nuevo vídeo + + + 7 + + + + + Your video has been unblacklisted + + + Su vídeo ha sido desbloqueado + + + 11 + + + + + Your video has been blacklisted + + + Su vídeo ha sido bloqueado + + + 15 + + + + + A new video abuse has been created on video + + + Una nueva denuncia de abuso ha sido creada sobre el vídeo + + + 19 + + + + + commented your video + + + ha comentado su vídeo + + + 23 + + + + + Your video has been published + + + Su vídeo ha sido publicado + + + 27 + + + + + Your video import succeeded + + + Importación de vídeo exitosa + + + 31 + + + + + Your video import failed + + + Error durante la importación de vídeo + + + 35 + + + + + User registered on your instance + + + Nuevo usuario registrado en su instancia + + + 39 + + + + + is following + + + your channel + + your account + + + ahora sigue + + + su canal + + su cuenta + + + 43 + + + + + mentioned you on video + + + le ha mencionado en el vídeo + + + 52 + + + + + + + + + + + 57 + + Unlisted No listado @@ -433,6 +582,13 @@ Cancelar la subscripción 25 + + + + + 11 + + Login @@ -497,7 +653,7 @@ Iniciar sesión Password Contraseña - 12 + 13 @@ -511,7 +667,7 @@ Iniciar sesión Login Identificarse - 38 + 36 @@ -521,6 +677,17 @@ Iniciar sesión 57 + + + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + Lo sentimos, no puede recuperar su contraseña porque el administrador de su instancia no configuró el sistema de correos electrónicos de PeerTube. + + + 63 + + Email Correo electrónico @@ -539,7 +706,7 @@ Iniciar sesión Send me an email to reset my password Enviar un correo electrónico para restablecer mi contraseña - 75 + 80 @@ -608,7 +775,7 @@ Iniciar sesión Signup Registro - 88 + 78 @@ -678,7 +845,18 @@ Iniciar sesión Change the language Cambiar el idioma - 88 + 86 + + + + + Help to translate PeerTube! + + + ¡Ayude a traducir PeerTube! + + + 8 @@ -689,7 +867,7 @@ Iniciar sesión Mi perfil público - 18 + 16 @@ -700,7 +878,7 @@ Iniciar sesión Mi cuenta - 22 + 20 @@ -711,7 +889,7 @@ Iniciar sesión Mis vídeos - 26 + 24 @@ -722,14 +900,14 @@ Iniciar sesión Desconectarse - 30 + 28 Create an account Crear una cuenta - 39 + 37 @@ -743,49 +921,49 @@ Iniciar sesión Subscriptions Suscripciones - 47 + 45 Overview Vista general - 52 + 50 Trending Tendencias - 57 + 55 Recently added Añadidos recientemente - 62 + 60 Local Local - 67 + 65 More Más - 72 + 70 Administration Administración - 76 + 74 @@ -799,14 +977,42 @@ Iniciar sesión Show keyboard shortcuts Mostrar los atajos de teclado - 91 + 89 Toggle dark interface Alternar con la interfaz oscura - 94 + 92 + + + + View your notifications + Ver sus notificaciones + + 3 + + + + Notifications + Notificaciones + + 10 + + + + Update your notification preferences + Actualizar sus preferencias de notificación + + 15 + + + + See all your notifications + Ver todas sus notificaciones + + 22 @@ -911,14 +1117,14 @@ Iniciar sesión Display unlisted and private videos Mostrar los vídeos no listados y privados - 11 + 14 No results. Ningún resultados - 17 + 20 @@ -976,15 +1182,64 @@ Iniciar sesión 7 - + + Contact administrator + Contactar al administrador de + + 3 + + + + Your name + Su nombre + + 11 + + + + Your email + Su dirección de correo electrónico + + 20 + + + + Your message + Su mensaje + + 29 + + + - About instance - + Cancel + - Acerca del nodo - + Cancelar + - 1 + 26 + + + + Submit + Enviar + + 31 + + + + About instance + Acerca de la instancia + + 4 + + + + Contact administrator + Contactar al administrador + + 6 @@ -998,47 +1253,47 @@ Iniciar sesión Terms Términos de uso - 44 + 39 User registration is allowed and El registro de usuarios está permitido y - 25 + 29 - + - this instance provides a baseline quota of space for the videos of its users. - + this instance provides a baseline quota of space for the videos of its users. + - este nodo ofrece una cuota estándar de de espacio para los vídeos de sus usuarios. - + esta instancia provee un espacio máximo de para los vídeos de sus usuarios. + - 27 + 31 - + - this instance provides unlimited space for the videos of its users. - + this instance provides unlimited space for the videos of its users. + - este nodo ofrece espacio ilimitado para los vídeos de sus usuarios. - + esta instancia provee un espacio ilimitado para los vídeos de sus usuarios. + - 31 + 35 - + - User registration is currently not allowed. - + User registration is currently not allowed. + - El registro de usuarios no está permitido actualmente. - + El registro de usuarios no está abierto actualmente. + - 36 + 40 @@ -1395,49 +1650,49 @@ Iniciar sesión Short description Descripción corta - 22 + 21 Default client route Routa de cliente por defecto - 55 + 48 Videos Overview Vista general de los vídeos - 58 + 51 Videos Trending Vídeos en Tendencia - 59 + 52 Videos Recently Added Vídeos Recientemente Añadidos - 60 + 53 Local videos Vídeos locales - 61 + 54 Policy on videos containing sensitive content Política para los vídeos que contengan material sensible - 70 + 61 @@ -1472,27 +1727,48 @@ Iniciar sesión Signup enabled Registro habilitado - 93 + 84 Signup requires email verification La suscripción requiere una verificación mediante correo electrónico - 100 + 91 Signup limit Límite de registro - 105 + 96 - - Import - Importar - + + Users + Usuarios + + 105 + + + + User default video quota + Cuota de vídeo por defecto del usuario + + 109 + + + + User default daily upload limit + Límite diario de subida por día por usuario + + 121 + + + + Import + Importar + 42 @@ -1500,49 +1776,35 @@ Iniciar sesión Video import with HTTP URL (i.e. YouTube) enabled La importación de vídeos mediante URL HTTP (por ejemplo YouTube) está activada - 120 + 141 Video import with a torrent file or a magnet URI enabled Importar video con un archivo torrent o un enlace magnet activado - 127 + 148 Administrator Administrador - 131 + 155 Admin email Correo del administrador - 134 - - - - Users - Usuarios - - 144 - - - - User default video quota - Cuota de vídeo por defecto del usuario - - 147 + 158 - - User default daily upload limit - Límite diario de subida por día por usuario + + Enable contact form + Habilitar el formulario de contacto - 161 + 169 @@ -1563,21 +1825,32 @@ Iniciar sesión Your Twitter username Tu usuario de Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica la cuenta de Twitter del sitio web o de la plataforma en la que el contenido fue publicado - 184 + 187 Instance whitelisted by Twitter Nodo en lista blanca de Twitter - 198 + 199 + + + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> + Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. + Si su instancia está autorizada por Twitter, un reproductor de vídeo estará incorporado al hilo Twitter cuando se comparta un vídeo desde PeerTube.<br /> + Si la instancia no está autorizada, usamos una tarjeta con una imagen con vínculo que redireccionará hacia su instancia PeerTube.<br /><br /> + Seleccione esta casilla, guarde la configuración y pruebe colocando el URL de un vídeo de su instancia (https://example.com/videos/watch/blabla) en <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> para verificar si su instancia está autorizada por Twitter. + + 200 @@ -1591,98 +1864,162 @@ Iniciar sesión Transcoding Transcodificar - 210 + 215 Transcoding enabled Transcodificación activada - 215 + 221 If you disable transcoding, many videos from your users will not work! ¡Si desactivas la transcodificación, muchos vídeos de tus usuarios no funcionarán! - 216 + 222 + + + + Allow additional extensions + Autorizar extensiones adicionales + + 231 + + + + Allow your users to upload .mkv, .mov, .avi, .flv videos + Autorizar sus usuarios a subir vídeos .mkv, .mov, .avi y .flv + + 232 Transcoding threads Hilos de transcodificaciones - 223 + 237 Resolution enabled Resolución activada - 239 + 252 + + + + + Cache + + + + + Caché + + + + + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Algunos archivos (previsualizaciones, subtítulos) no están federados. Los obtenemos directamente del nodo de origen y las ponemos en caché. - 249 + 265 Previews cache size Tamaño de caché de las previsualizaciones - 254 + 271 Video captions cache size Tamaño de caché de los subtítulos - 265 + 280 Customizations Personalizaciones - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escribir código Javascript directamente.<br />Ejemplo: <pre>console.log('mi nodo es maravilloso');</pre> - 281 + 297 + + + + + Write directly CSS code. Example:<br /> + <pre> + body + background-color: red; + + </pre> + + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + + + Escriba directamente código CSS. Por ejemplo:<br /> + <pre> + body + background-color: red; + + </pre> + + Prefijar con <em>#custom-css</em> para sobrecargar estilos. Por ejemplo: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + + + 311 Advanced configuration Configuración avanzada - 207 + 212 Update configuration Actualizar configuración - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Parece que la configuración no es válida. Por favor, busque errores potenciales en las diferentes pestañas. - 326 + 341 @@ -1707,6 +2044,17 @@ Iniciar sesión 7 + + + Moderation + + + Moderación + + + 11 + + Jobs @@ -1754,6 +2102,13 @@ Iniciar sesión 21 + + Filter... + Filtrar... + + 27 + + ID ID @@ -1789,6 +2144,27 @@ Iniciar sesión 11 + + Accepted + Aceptado + + 32 + + + + Pending + Pendiente + + 33 + + + + Redundancy allowed + Redundancia autorizada + + 22 + + Manage follows Gestionar seguimientos @@ -1893,6 +2269,13 @@ Iniciar sesión 65 + + Daily video quota + Cuota diaria de vídeo + + 72 + + Users list Lista de usuarios @@ -1900,6 +2283,13 @@ Iniciar sesión 2 + + Batch actions + Acciones másivas + + 19 + + Username Nombre de usuario @@ -1907,6 +2297,13 @@ Iniciar sesión 40 + + (banned) + (expulsado) + + 65 + + Go to the account page Ir a la página de la cuenta @@ -1914,6 +2311,52 @@ Iniciar sesión 133 + + User's email must be verified to login + Se requiere validar la dirección de correo electrónico del usuario antes de conectarse + + 72 + + + + User's email is verified / User can login without email verification + La dirección de correo electrónico del usuario ha sido verificada / El usuario puede conectarse sin verificación de dirección de correo electrónico + + 76 + + + + Ban reason: + Razón de la expulsión: + + 95 + + + + Moderation comment + Comentarios de moderación + + 3 + + + + + This comment can only be seen by you or the other moderators. + + + Este comentario puede ser visto solo por usted y los otros moderadores. + + + 17 + + + + Update this comment + Actualizar este comentario + + 25 + + Reporter Reportador @@ -1928,6 +2371,13 @@ Iniciar sesión 14 + + State + Estado + + 11 + + Go to the account Ir a la cuenta @@ -1942,6 +2392,69 @@ Iniciar sesión 33 + + Actions + Acciones + + 35 + + + + Reason: + Razón: + + 53 + + + + Moderation comment: + Comentario de moderación: + + 57 + + + + Video name + Nombre del vídeo + + 8 + + + + Sensitive + Sensible + + 9 + + + + Date + Fecha + + 11 + + + + Blacklist reason: + Razón del bloqueo: + + 43 + + + + Moderation + Moderación + + 2 + + + + Video abuses + Vídeos denunciados como abusivos + + 5 + + Blacklisted videos Vídeos en lista negra @@ -1949,18 +2462,39 @@ Iniciar sesión 7 - - My settings - Mis ajustes + + Muted accounts + Cuentas silenciadas - 3 + 2 - - My videos - Mis vídeos + + Muted servers + Servidores silenciados - 14 + 11 + + + + Account + Cuenta + + 12 + + + + Muted at + Silenciado en + + 13 + + + + Unmute + Dejar de silenciar + + 23 @@ -1974,28 +2508,46 @@ Iniciar sesión Profile Perfil - 8 + 7 Video settings Ajustes de vídeo - 15 + 16 Danger zone Zona peligrosa - 18 + 19 - - Submit - Enviar + + Change ownership + Cambiar el titular - 24 + 46 + + + + Select the next owner + Seleccionar el próxima titular + + 9 + + + + + Cancel + + + Cancelar + + + 35 @@ -2005,6 +2557,13 @@ Iniciar sesión 19 + + Blacklisted + Bloqueado + + 22 + + Cancel @@ -2036,6 +2595,13 @@ Cancelar 6 + + Example: my_channel + Por ejemplo: mi_canal + + 15 + + Display name Nombre a mostrar @@ -2059,6 +2625,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 8 + + You don't have any subscriptions yet. + No tiene suscripciones todavía. + + 1 + + Created by Creado por @@ -2073,32 +2646,157 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 16 - - Change password - Cambiar contraseña + + Accept ownership + Aceptar la titularidad - 30 + 3 - - New password - Nueva contraseña + + Select the target channel + Seleccionar el canal objetivo - 15 + 9 - - Confirm new password - Confirmar nueva contraseña + + Initiator + Iniciador - 23 + 13 - - Default policy on videos containing sensitive content - Política por defecto para vídeos que contengan material sensible - - 3 + + + Created + + + + Creado + + + + 15 + + + + Status + Estatus + + 19 + + + + Action + Acción + + 20 + + + + + + + 39 + + + + Refuse + Rechazar + + 47 + + + + Muted instances + Instancias silenciadas + + 2 + + + + History enabled + Historial habilitado + + 4 + + + + Delete history + Borrar el historial + + 8 + + + + You don't have videos history yet. + No tiene historial de vídeos todavía + + 13 + + + + views + vistas + + 22 + + + + Notification preferences + Preferencias de notificación + + 2 + + + + Mark all as read + Marcar todo como leído + + 4 + + + + Change password + Cambiar contraseña + + 30 + + + + Current password + Contraseña actual + + 7 + + + + New password + Nueva contraseña + + 15 + + + + Confirm new password + Confirmar nueva contraseña + + 23 + + + + Default policy on videos containing sensitive content + Política por defecto para vídeos que contengan material sensible + + 3 + + + + Use WebTorrent to exchange parts of the video with others + Usar WebTorrent para intercambiar partes del vídeo con otros + + 21 @@ -2143,6 +2841,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 18 + + Once you delete your account, there is no going back. Please be certain. + Eliminar su cuenta es definitivo. ¿Está seguro? + + 2 + + Delete your account Eliminar tu cuenta @@ -2150,6 +2855,20 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 4 + + Activities + Actividades + + 2 + + + + Web + Web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2161,6 +2880,60 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 1 + + + Verify account email confirmation + + + Verificar la confirmación de la dirección de correo electrónico de la cuenta + + + 2 + + + + + Your email has been verified and you may now login. Redirecting... + + + Su dirección de correo electrónico ha sido verificada y puede conectarse ahora. En curso de redirección... + + + 6 + + + + An error occurred. + Un error ocurrió. + + 11 + + + + + Request email for account verification + + + Solicitar un correo electrónico de verificación de la cuenta + + + 2 + + + + Send verification email + Enviar un correo electrónico de verificación + + 17 + + + + This instance does not require email verification. + Esta instancia no requiere verificación por correo electrónico + + 20 + + Support this channel Apoyar este canal @@ -2203,6 +2976,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 159 + + Sorry, but something went wrong + Disculpas, algo salió mal + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2228,18 +3008,25 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 6 + + Scheduled + Programado + + 25 + + Publish will be available when upload is finished La publicación estará disponible cuando finalice la subida - 53 + 58 Publish Publicar - 60 + 65 @@ -2249,6 +3036,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 6 + + Or + O + + 11 + + Paste magnet URI Pegar el enlace magnético @@ -2323,6 +3117,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 24 + + + This will replace an existing caption! + + + Eso remplazará el texto existente! + + + 29 + + Add this caption Añadir este subtítulo @@ -2344,6 +3149,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 191 + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Se puede utilizar etiquetas para sugerir recomendaciones relevantes.</br>Presione Enter para añadir una nueva etiqueta. + + 18 + + + + + Tag + + Etiqueta + + 21 + + + + Enter a new tag + Ingresar una nueva etiqueta + + 21 + + Video descriptions are truncated by default and require manual action to expand them. Las descripciones de vídeo se muestran truncadas por defecto y requieren de acción manual para expandirlas. @@ -2383,14 +3209,14 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Wait transcoding before publishing the video Esperar transcodificación antes de publicar el vídeo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Si decides no esperar a la transcodificación antes de publicar el vídeo, quizás no se pueda reproducir hasta que finalice la transcodificación. - 131 + 132 @@ -2404,49 +3230,81 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Add another caption Añadir otro subtítulo - 146 + 147 See the subtitle file Ver el archivo de subtítulo - 155 + 156 + + + + Already uploaded ✔ + Ya ha sido subido ✔ + + 160 + + + + Will be created on update + Estará creado al actualizar + + 168 Cancel create Cancelar creación - 169 + 170 + + + + Will be deleted on update + Estará eliminado al actualizar + + 176 Cancel deletion Cancelar borrado - 177 + 178 + + + + + No captions for now. + + + Ningún texto por el momento. + + + 183 Captions Subtítulos - 139 + 140 Upload thumbnail Subir miniatura - 195 + 196 Upload preview Subir previsualización - 202 + 203 @@ -2460,14 +3318,14 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Short text to tell people how they can support you (membership platform...). Breve texto para explicar a la gente cómo pueden apoyarte (plataforma de miembros...). - 209 + 210 Advanced settings Ajustes avanzados - 190 + 191 @@ -2509,6 +3367,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 37 + + + Cancel + + + Cancelar + + + 47 + + Download Descargar @@ -2523,6 +3392,19 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 3 + + + Your report will be sent to moderators of . + It will be forwarded to origin instance too. + + + Su reporte estará enviado a los moderadores de . + También estará transferido a la instancia original . + + + 9 + + Share Compartir @@ -2544,6 +3426,31 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 34 + + + The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). + + + El URL no es seguro (no utiliza HTTPS), por lo que el vídeo embebido no funcionará en los sitios web HTTPS (los navegadores web bloquean las consultas HTTP inseguras en los sitios web HTTPS). + + + 45 + + + + Close + Cerrar + + 51 + + + + Blacklist video + Bloquear el vídeo + + 3 + + The video is being imported, it will be available when the import is finished. @@ -2566,6 +3473,46 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 15 + + + This video will be published on . + + + Este vídeo será publicado el . + + + 19 + + + + This video is blacklisted. + Este vídeo está bloqueado + + 24 + + + + + Published - views + + + Publicado - vistas + + + 37 + + + + + Published - views + + + Publicado - vistas + + + 46 + + Like this video Me gusta este vídeo @@ -2629,6 +3576,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 100 + + Unblacklist this video + Desbloquear este vídeo + + 99 + + Delete this video Eliminar este vídeo @@ -2643,6 +3597,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 123 + + By + Por + + 134 + + Show more Mostrar más @@ -2657,6 +3618,24 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 152 + + Friendly Reminder: + Recuerdo amistoso: + + 208 + + + + + the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. + + + el sistema utilizado para compartir este vídeo implica que algunas informaciones técnicas acerca de su sistema (como la dirección IP pública) pueden estar enviadas a otros pares. + + + 209 + + More information Más información @@ -2682,6 +3661,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 215 + + + Other videos + + + Otros vídeos + + + 2 + + Comments @@ -2736,6 +3726,57 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 20 + + You are one step away from commenting + Está a un paso de poder comentar + + 28 + + + + + If you have an account on this instance, you can login: + + + Si tiene una cuenta en esta instancia, puede conectarse: + + + 32 + + + + login to comment + conectarse para comentar + + 35 + + + + + Otherwise you can comment using an account on any ActivityPub-compatible instance. + On most platforms, you can find the video by typing its URL in the search bar and then comment it + from within the software's interface. + + + Sino, puede comentar usando una cuenta de cualquier instancia compatible con ActivityPub. + En la mayoría de las plataformas, puede encontrar el vídeo colocando su URL en el campo de búsqueda y luego comentarlo + desde la interfaz del software. + + + 36 + + + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + + Si tiene una cuenta en Mastodon o Pleroma, puede abrirlo directamente en su interfaz: + + + 41 + + Highlighted comment Comentario resaltado @@ -2750,9 +3791,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 14 - - Error getting about from server - Error al obtener información del servidor + + Cannot get about information from server + No se puede obtener información del servidor + + 1 + + + + Your message has been sent. + Su mensaje ha sido remitido + + 1 + + + + You already sent this form recently + Ya envió este formulario recientemente 1 @@ -2778,16 +3833,44 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Error - Error + + 240p + 240p 1 - - Success - Correcto + + 360p + 360p + + 1 + + + + 480p + 480p + + 1 + + + + 720p + 720p + + 1 + + + + 1080p + 1080p + + 1 + + + + Auto (via ffmpeg) + Auto (vía ffmpeg) 1 @@ -2806,6 +3889,69 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + 100MB + 100MB + + 1 + + + + 500MB + 500MB + + 1 + + + + 1GB + 1GB + + 1 + + + + 5GB + 5GB + + 1 + + + + 20GB + 20GB + + 1 + + + + 50GB + 50GB + + 1 + + + + 10MB + 10MB + + 1 + + + + 50MB + 50MB + + 1 + + + + 2GB + 2GB + + 1 + + is not valid no es válido @@ -2869,6 +4015,97 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + enabled + habilitada + + 1 + + + + disabled + deshabilitada + + 1 + + + + Redundancy for is + La redundancia para está + + 1 + + + + Account unmuted by your instance. + La cuenta no está silenciada por su instancia. + + 1 + + + + Instance unmuted by your instance. + La instancia no está silenciada por su instancia. + + 1 + + + + Comment updated. + Comentario actualizado + + 1 + + + + Delete this report + Eliminar este reporte + + 1 + + + + Update moderation comment + Actualizar el comentario de moderación + + 1 + + + + Mark as accepted + Marcar como aceptado + + 1 + + + + Mark as rejected + Marcar como rechazado + + 1 + + + + Do you really want to delete this abuse report? + ¿Confirma la eliminación del reporte de abuso? + + 1 + + + + Abuse deleted. + Reporte de abuso eliminado. + + 1 + + + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. + ¿Confirmar el desbloqueo de este vídeo? Estará disponible de nuevo en la lista de vídeos. + + 1 + + Video removed from the blacklist. Vídeo eliminado de la lista negra. @@ -2897,6 +4134,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Unban + Dejar sin efecto la expulsión + + 1 + + + + Set Email as Verified + Establecer la dirección de correo electrónico como Verificada + + 1 + + + + You cannot ban root. + No puede expulsar al root. + + 1 + + + + Do you really want to unban users? + ¿Confirma dejar sin efecto la expulsión de usuarios? + + 1 + + + + users unbanned. + usuarios expulsados. + + 1 + + You cannot delete root. No puedes eliminar al root. @@ -2904,6 +4176,90 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + If you remove these users, you will not be able to create others with the same username! + ¡Si elimina estos usuarios, no será posible crear otros con el mismo nombre de usuario! + + 1 + + + + users deleted. + usuarios eliminados. + + 1 + + + + users email set as verified. + direcciones de correo electrónico de usuarios establecidas como verificadas. + + 1 + + + + Account unmuted. + La cuenta ya no está silenciada. + + 1 + + + + Instance unmuted. + La instancia ya no está silenciada. + + 1 + + + + My videos history + Mi historial de vídeos + + 1 + + + + Videos history is enabled + El historial de vídeos está habilitado + + 1 + + + + Videos history is disabled + El historial de vídeos está deshabilitado + + 1 + + + + Delete videos history + Eliminar el historial de vídeos + + 1 + + + + Are you sure you want to delete all your videos history? + ¿Confirma la eliminación de todo su historial de vídeos? + + 1 + + + + Videos history deleted + Historial de vídeos eliminado + + 1 + + + + Ownership accepted + Titularidad aceptada + + 1 + + Password updated. Contraseña actualizada. @@ -2911,6 +4267,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + You current password is invalid. + Su contraseña actual es invalida. + + 1 + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. Estás seguro de querer eliminar tu cuenta? Todos tus datos serán eliminados, incluyendo canales, vídeos, etc. @@ -2939,6 +4302,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + New video from your subscriptions + Nuevo vídeo desde sus suscripciones + + 1 + + + + New comment on your video + Nuevo comentario en su vídeo + + 1 + + + + New video abuse on local video + Nueva denuncia de abuso sobre un vídeo local + + 1 + + + + One of your video is blacklisted/unblacklisted + Uno de sus vídeos ha sido bloqueado/desbloqueado + + 1 + + + + Video published (after transcoding/scheduled update) + Vídeo publicado (después de una transcodificación / actualización programada) + + 1 + + + + Video import finished + Importación de vídeo terminada + + 1 + + + + A new user registered on your instance + Un nuevo usuario se registró en su instancia + + 1 + + + + You or your channel(s) has a new follower + Usted o su(s) canal(es) tiene un nuevo seguidor + + 1 + + + + Someone mentioned you in video comments + Alguien le mencionó en comentarios de vídeo + + 1 + + + + Preferences saved + Preferencias guardadas + + 1 + + Profile updated. Perfil actualizado. @@ -2967,6 +4400,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + This name already exists on this instance. + El nombre ya existe en esta instancia. + + 1 + + Create Crear @@ -2981,23 +4421,16 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - ¿De verdad quieres eliminar ? Esto eliminará también todos los vídeos subidos a este canal. - - 1 - - - - Please type the name of the video channel to confirm - Por favor escribe el nombre del canal de vídeo para confirmar + + Video channel deleted. + Canal de vídeo eliminado. 1 - - Video channel deleted. - Canal de vídeo eliminado. + + My videos + Mis vídeos 1 @@ -3065,6 +4498,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Ownership change request sent. + Solicitud de cambio de titularidad enviada. + + 1 + + + + My library + Mi biblioteca + + 1 + + + + My channels + Mis canales + + 1 + + + + My subscriptions + Mis suscripciones + + 1 + + + + My history + Mi historial + + 1 + + + + Misc + Diversos + + 1 + + + + Ownership changes + Cambios de titularidad + + 1 + + + + My settings + Mis ajustes + + 1 + + + + My notifications + Mis notificaciones + + 1 + + + + An email with verification link will be sent to . + Un correo electrónico con un vínculo de verificación será enviado a . + + 1 + + Unable to find user id or verification string. No se pudo encontrar el id de usuario o la cadena de verificación. @@ -3072,6 +4575,97 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Subscribe to the account + Suscribirse a la cuenta + + 1 + + + + Focus the search bar + Enfocar la barra de búsqueda + + 1 + + + + Toggle the left menu + Conmutar el menú de la izquierda + + 1 + + + + Go to the videos overview page + Ir a la página general de vídeos + + 1 + + + + Go to the trending videos page + Ir a la página de vídeos populares + + 1 + + + + Go to the recently added videos page + Ir a la página de vídeos recientes + + 1 + + + + Go to the local videos page + Ir a la página de vídeos locales + + 1 + + + + Go to the videos upload page + Ir a la página de subida de vídeos + + 1 + + + + Toggle Dark theme + Conmutar el tema Oscuro + + 1 + + + + Go to my subscriptions + Ir a mis suscripciones + + 1 + + + + Go to my videos + Ir a mis vídeos + + 1 + + + + Go to my imports + Ir a mis importaciones + + 1 + + + + Go to my channels + Ir a mis canales + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -3088,6 +4682,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Error + Error + + 1 + + You need to reconnect. Tienes que reconectar. @@ -3102,6 +4703,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Keyboard Shortcuts: + Atajos de teclado: + + 1 + + + + Info + Info + + 1 + + + + Success + Correcto + + 1 + + + + Incorrect username or password. + Nombre de usuario o contraseña incorrecta + + 1 + + + + You account is blocked. + Su cuenta ha sido bloqueada + + 1 + + An email with the reset password instructions will be sent to . Un correo con las instrucciones para restablecer la contraseña será enviado a . @@ -3270,30 +4906,93 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Signup limit must be a number. - El límite de registro debe ser un número. + + Signup limit must be a number. + El límite de registro debe ser un número. + + 1 + + + + Admin email is required. + Se requiere un correo de administrador. + + 1 + + + + Admin email must be valid. + El correo de adminstrador ha de ser válido. + + 1 + + + + Transcoding threads is required. + Se requieren hilos de transcodificación. + + 1 + + + + Transcoding threads must be greater or equal to 0. + El número de subprocesos de transcodificación tiene que ser superior o igual a 0. + + 1 + + + + Email is required. + Se requiere un correo electrónico. + + 1 + + + + Email must be valid. + El correo electrónico ha de ser válido. + + 1 + + + + Your name is required. + Su nombre es requerido. + + 1 + + + + Your name must be at least 1 character long. + Su nombre tiene que contener por lo menos 1 carácter. + + 1 + + + + Your name cannot be more than 120 characters long. + Su nombre no puede contener más de 120 caracteres. 1 - - Admin email is required. - Se requiere un correo de administrador. + + A message is required. + Se tiene que colocar un mensaje. 1 - - Admin email must be valid. - El correo de adminstrador ha de ser válido. + + The message must be at least 3 characters long. + El mensaje tiene que contener por lo menos 3 caracteres. 1 - - Transcoding threads is required. - Se requieren hilos de transcodificación. + + The message cannot be more than 5000 characters long. + El mensaje no puede contener más de 5.000 caracteres. 1 @@ -3319,37 +5018,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Username must be at least 3 characters long. - El nombre de usuario ha de ocupar más de 3 caracteres. - - 1 - - - - Username cannot be more than 20 characters long. - El nombre de usuario no puede ocupar más de 20 caracteres. - - 1 - - - - Username should be only lowercase alphanumeric characters. - El nombre de usuario debe utilizar únicamente caracteres alfanuméricos en minúscula. + + Username must be at least 1 character long. + El nombre de usuario tiene que contener por lo menos un carácter. 1 - - Email is required. - Se requiere un correo electrónico. + + Username cannot be more than 50 characters long. + El nombre de usuario no puede contener más de 50 caracteres. 1 - - Email must be valid. - El correo electrónico ha de ser válido. + + Username should be lowercase alphanumeric; dots and underscores are allowed. + El nombre de usuario puede contener minúsculas, cifras, puntos y barras bajas. 1 @@ -3389,6 +5074,20 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Daily upload limit is required. + Se requiere colocar un límite diario de subida. + + 1 + + + + Daily upload limit must be greater than -1. + El límite diario de subida tiene que ser superior a -1. + + 1 + + User role is required. Se requiere un rol de usuario. @@ -3403,16 +5102,16 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Display name must be at least 3 characters long. - El nombre para mostrar debe ocupar como mínimo 3 caracteres. + + Display name must be at least 1 character long. + El nombre mostrado tiene que contener por lo menos 1 carácter. 1 - - Display name cannot be more than 120 characters long. - El nombre a mostrar no puede ocupar más de 120 caracteres. + + Display name cannot be more than 50 characters long. + El nombre mostrado no puede contener más de 50 caracteres. 1 @@ -3424,6 +5123,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Description cannot be more than 1000 characters long. + La descripción no puede contener más de 1.000 caracteres. + + 1 + + You must to agree with the instance terms in order to registering on it. Debes aceptar los términos de uso del nodo para poder registrarte en él. @@ -3431,6 +5137,20 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Ban reason must be at least 3 characters long. + La razón de la expulsión tiene que contener por lo menos 3 caracteres. + + 1 + + + + Ban reason cannot be more than 250 characters long. + La razón de la expulsión no puede contener más de 250 caracteres. + + 1 + + Report reason is required. Se requiere un motivo para reportar. @@ -3445,9 +5165,37 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Report reason cannot be more than 300 characters long. - El motivo del reporte no puede ocupar más de 300 caracteres. + + Moderation comment is required. + Se requiere llenar el comentario de moderación. + + 1 + + + + Moderation comment must be at least 2 characters long. + El comentario de moderación tiene que contener por lo menos 2 caracteres. + + 1 + + + + The channel is required. + Se requiere llenar el canal. + + 1 + + + + Blacklist reason must be at least 2 characters long. + La razón del bloqueo tiene que contener por lo menos 2 caracteres. + + 1 + + + + Blacklist reason cannot be more than 300 characters long. + La razón del bloqueo no puede contener más de 300 caracteres. 1 @@ -3466,6 +5214,48 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + The username is required. + Se requiere llenar el nombre de usuario. + + 1 + + + + You can only transfer ownership to a local account + Solo puede transferir la titularidad a una cuenta local + + 1 + + + + Name is required. + Se requiere llenar el nombre. + + 1 + + + + Name must be at least 1 character long. + El nombre tiene que contener por lo menos 1 carácter. + + 1 + + + + Name cannot be more than 50 characters long. + El nombre no puede contener más de 50 caracteres. + + 1 + + + + Name should be lowercase alphanumeric; dots and underscores are allowed. + El nombre puede contener minúsculas, cifras, puntos y barras bajas. + + 1 + + Support text must be at least 3 characters long. El texto para el apoyo ha de ocupar como mínimo 3 caracteres. @@ -3473,6 +5263,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Support text cannot be more than 1000 characters long. + El texto de apoyo no puede contener más de 1.000 caracteres. + + 1 + + Comment is required. Se requiere comentario. @@ -3564,6 +5361,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Video support cannot be more than 1000 characters long. + El soporte de vídeo no puede contener más de 1.000 caracteres. + + 1 + + A date is required to schedule video update. Se requiere una fecha para actualizar la programación del vídeo. @@ -3914,6 +5718,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Transcode your videos in multiple resolutions + Transcodificar sus vídeos en múltiples resoluciones + + 1 + + + + HTTP import (YouTube, Vimeo, direct URL...) + Importación HTTP (YouTube, Vimeo, URL directo...) + + 1 + + + + Torrent import + Importación de torrent + + 1 + + ~ ~ @@ -4068,6 +5893,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + users banned. + usuarios bloqueados. + + 1 + + + + User banned. + Usuario bloqueado. + + 1 + + + + Do you really want to unban ? + ¿Confirma el desbloqueo de ? + + 1 + + + + User unbanned. + El usuario ha sido desbloqueado. + + 1 + + + + If you remove this user, you will not be able to create another with the same username! + ¡Si elimina este usuario, no podrá crear otro con el mismo nombre de usuario! + + 1 + + User deleted. Usuario eliminado. @@ -4075,6 +5935,111 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + User email set as verified + El correo electrónico del usuario establecido como verificado + + 1 + + + + Account muted. + Cuenta silenciada. + + 1 + + + + Instance muted. + Instancia silenciada. + + 1 + + + + Account muted by the instance. + Cuenta silenciada por la instancia. + + 1 + + + + Account unmuted by the instance. + Cuenta ya no silenciada por la instancia. + + 1 + + + + Instance muted by the instance. + Instancia silenciada por la instancia. + + 1 + + + + Instance unmuted by the instance. + La instancia ya no es silenciada por la instancia. + + 1 + + + + Mute this account + Silenciar esta cuenta + + 1 + + + + Unmute this account + Dejar de silenciar esta cuenta + + 1 + + + + Mute the instance + Silenciar esta instancia + + 1 + + + + Unmute the instance + Dejar de silenciar esta instancia + + 1 + + + + Mute this account by your instance + Silenciar esta cuenta por su instancia + + 1 + + + + Unmute this account by your instance + Dejar de silenciar esta cuenta por su instancia + + 1 + + + + Mute the instance by your instance + Silenciar esta instancia por su instancia + + 1 + + + + Unmute the instance by your instance + Dejar de silenciar esta instancia por su instancia + + 1 + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. La petición es demasiado grande para el servidor. Por favor contacta con tu administrador si quieres aumentar el límite de tamaño. @@ -4103,6 +6068,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Subscribed to + Suscrito a + + 1 + + + + Subscribed + Suscrito + + 1 + + + + Unsubscribed from + Ya no está suscrito a + + 1 + + + + Unsubscribed + Ya no está suscrito + + 1 + + + + Moderator + Moderador + + 1 + + + + Only I can see this video + Soy el único que pueda ver este vídeo + + 1 + + + + Only people with the private link can see this video + Solo las personas que tengan el vínculo privado pueden ver este vídeo + + 1 + + + + Anyone can see this video + Todos pueden ver este vídeo + + 1 + + + + Welcome! Now please check your emails to verify your account and complete signup. + ¡Le damos la bienvenida! Ahora revise sus correos electrónicos para verificar su cuenta y terminar el proceso de registro. + + 1 + + + + You are now logged in as ! + ¡Está conectado como ! + + 1 + + Video to import updated. Video to import updated. @@ -4131,23 +6166,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Info - Info + + Upload cancelled + Subida cancelada 1 - - Upload cancelled - Subida cancelada + + Your video quota is exceeded with this video (video size: , used: , quota: ) + Con este vídeo, está pasando su cuota de espacio (tamaño del vídeo: , espacio utilizado: , cuota: ) 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Lo sentimos pero PeerTube no puede manejar vídeos > 8 GB + + Your daily video quota is exceeded with this video (video size: , used: , quota: ) + Con este vídeo, su cuota de espacio diario ha sido excedido (tamaño del vídeo: , espacio usado: , cuota: ) 1 @@ -4173,6 +6208,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Video blacklisted. + Vídeo bloqueado + + 1 + + Copied Copiado @@ -4187,6 +6229,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Start at + Iniciar a + + 1 + + + + Like the video + Colocar Me gusta a este vídeo + + 1 + + + + Dislike the video + Eliminar Me gusta de este vídeo + + 1 + + Do you really want to delete this video? ¿De verdad quieres eliminar este vídeo? @@ -4215,5 +6278,12 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Videos from your subscriptions + Vídeos desde sus suscripciones + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_eu_ES.xml b/client/src/locale/target/angular_eu_ES.xml index d17189c7a..0393ab85c 100644 --- a/client/src/locale/target/angular_eu_ES.xml +++ b/client/src/locale/target/angular_eu_ES.xml @@ -499,7 +499,7 @@ Password Pasahitza - 12 + 13 @@ -513,7 +513,7 @@ Login Hasi saioa - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password Bidali e-mail bat nire pasahitza berrezartzeko - 75 + 80 @@ -612,7 +612,7 @@ Signup Eman izena - 88 + 78 @@ -682,7 +682,7 @@ Change the language Aldatu hizkuntza - 88 + 86 @@ -693,7 +693,7 @@ Nire profil publikoa - 18 + 16 @@ -704,7 +704,7 @@ Nire kontua - 22 + 20 @@ -715,7 +715,7 @@ Nire bideoak - 26 + 24 @@ -726,14 +726,14 @@ Amaitu saioa - 30 + 28 Create an account Sortu kontu bat - 39 + 37 @@ -747,49 +747,49 @@ Subscriptions Harpidetzak - 47 + 45 Overview Gainbegirada - 52 + 50 Trending Joerak - 57 + 55 Recently added Gehitutako azkenak - 62 + 60 Local Tokikoa - 67 + 65 More Gehiago - 72 + 70 Administration Administrazioa - 76 + 74 @@ -803,14 +803,14 @@ Show keyboard shortcuts Erakutsi teklatu-lasterbideak - 91 + 89 Toggle dark interface Txandakatu interfaze iluna - 94 + 92 @@ -915,14 +915,14 @@ Display unlisted and private videos Bistaratu zerrendatu gabeko bideoak eta bideo pribatuak - 11 + 14 No results. Emaitzarik ez. - 17 + 20 @@ -980,15 +980,22 @@ 7 - + - About instance - + Cancel + - instantziari buruz - + Utzi + - 1 + 26 + + + + Submit + Bidali + + 31 @@ -1002,45 +1009,14 @@ Terms Baldintzak - 44 + 39 User registration is allowed and Erabiltzaile berriek izena ematea onartzen da eta - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - instantzia honek eskaintzen ditu erabiltzaileen bideoetarako oinarrizko kuota gisa. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - instantzia honek mugagabeko espazioa eskaintzen du bere erabiltzaileen bideoetarako. - - 31 - - - - - User registration is currently not allowed. - - -Erabiltzaile berriek izena ematea ez da onartzen orain. - - 36 + 29 @@ -1395,49 +1371,49 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Short description Deskripzio laburra - 22 + 21 Default client route Lehenetsitako bezeroaren ibilbidea - 55 + 48 Videos Overview Bideoen gainbegirada - 58 + 51 Videos Trending Joera diren bideoak - 59 + 52 Videos Recently Added Azkenaldian gehitutako bidoeak - 60 + 53 Local videos Tokiko bideoak - 61 + 54 Policy on videos containing sensitive content Eduki hunkigarria duten bideoen politika - 70 + 61 @@ -1472,23 +1448,44 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Signup enabled Izena ematea gaituta - 93 + 84 Signup requires email verification Izena emateko e-mail helbidea baieztatu behar da - 100 + 91 Signup limit Izena emateko muga + + 96 + + + + Users + Erabiltzaileak 105 + + User default video quota + Erabiltzailearen lehenetsitako bideo-kuota + + 109 + + + + User default daily upload limit + Erabiltzailearentzat lehenetsitako eguneko igoera muga + + 121 + + Import Inportatu @@ -1500,49 +1497,28 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Video import with HTTP URL (i.e. YouTube) enabled HTTP URL bidezko bideoen inportazioa gaituta (adibidez YouTube) - 120 + 141 Video import with a torrent file or a magnet URI enabled Bideoa torrent fitxategia edo magnet URL bidez inportatzea gaituta - 127 + 148 Administrator Administratzailea - 131 + 155 Admin email Administratzailearen e-maila - 134 - - - - Users - Erabiltzaileak - - 144 - - - - User default video quota - Erabiltzailearen lehenetsitako bideo-kuota - - 147 - - - - User default daily upload limit - Erabiltzailearentzat lehenetsitako eguneko igoera muga - - 161 + 158 @@ -1563,21 +1539,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Your Twitter username Zure Twitter erabiltzaile-izena - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Edukia argitaratuko den webgune edo plataformarentzat Twitter kontua adierazten du. - 184 + 187 Instance whitelisted by Twitter Twitter-ek onartutako instantzia - 198 + 199 @@ -1591,35 +1567,35 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Transcoding Transkodeketa - 210 + 215 Transcoding enabled Transkodeketa gaituta - 215 + 221 If you disable transcoding, many videos from your users will not work! Transkodeketa desgaitzen baduzu, erabiltzaileen bideo askok ez dute funtzionatuko! - 216 + 222 Transcoding threads Transkodetze hariak - 223 + 237 Resolution enabled bereizmena gaituta - 239 + 252 @@ -1634,82 +1610,47 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Fitxategi batzuk ez dira federatzen (aurrebistak, azpitituluak). Zuzenean jatorrizko instantziatik jasotzen ditugu eta cachean gorde. - 249 + 265 Previews cache size Aurrebisten cachearen tamaina - 254 + 271 Video captions cache size Bideoaren azpitituluen cachearen tamaina - 265 + 280 Customizations Pertsonalizazioak - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> IdatziJavaScript kodea zuzenean.<br />Adibidez: <pre>console.log('nire instantzia zoragarria da');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Idatzi CSS kodea zuzenean. Adibidez:<br /> - <pre> - body - background-color: red; - - </pre> - - Idatzi aurretik <em>#custom-css</em> estiloak gainidazteko. Adibidez: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1718,21 +1659,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Advanced configuration Konfigurazio aurreratua - 207 + 212 Update configuration Eguneratu konfigurazioa - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Konfigurazioa baliogabea dela dirudi. Bilatu zer egon daitekeen gaizki fitxa desberdinetan begiratuz. - 326 + 341 @@ -2021,21 +1962,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. User's email must be verified to login Erabiltzailearen e-mail helbidea baieztatu behar da saioa hasi aurretik - 70 + 72 User's email is verified / User can login without email verification Erabiltzailearen e-mail helbidea baieztatuta dago / Erabiltzaileak e-mail helbidea baieztatu gabe saioa hasi dezake - 74 + 76 Ban reason: Debekatzeko arrazoia: - 92 + 95 @@ -2102,7 +2043,7 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Actions Ekintzak - 33 + 35 @@ -2137,14 +2078,14 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Date Data - 10 + 11 Blacklist reason: Zerrenda beltzean sartzeko arrazoia: - 41 + 43 @@ -2196,69 +2137,6 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 23 - - My settings - Nire ezarpenak - - 3 - - - - My library - Nire liburutegia - - 7 - - - - My channels - Nire kanalak - - 12 - - - - My videos - Nire bideoak - - 14 - - - - My subscriptions - Nire harpidetzak - - 16 - - - - My imports - Nire inportazioak - - 18 - - - - Misc - Denetarik - - 24 - - - - Muted instances - Mutututako instantziak - - 2 - - - - Ownership changes - Jabetza aldaketak - - 33 - - Video quota: Bideo-kuota: @@ -2270,21 +2148,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Profile Profila - 8 + 7 Video settings Bideo ezarpenak - 15 + 16 Danger zone Eremu arriskutsua - 18 + 19 @@ -2312,13 +2190,6 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 35 - - Submit - Bidali - - 24 - - - views - ikustaldi @@ -2477,6 +2348,13 @@ Kanal honetara bideo bat igotzen duzunean, bideoa babesteko eremua testu honekin 47 + + Muted instances + Mutututako instantziak + + 2 + + Change password Aldatu pasahitza @@ -2725,14 +2603,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Publish will be available when upload is finished Argitaratzea behin igoera bukatzean egongo da erabilgarri - 53 + 58 Publish Argitaratu - 60 + 65 @@ -2915,14 +2793,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Wait transcoding before publishing the video Itxaron transkodetzeari bideoa argitaratu aurretik - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Bideoa argitaratu aurretik ez baduzu transkodetzea bukatu arte itxaroten, bideoa transkodetzea bukatu arte ezin ikustea gerta daiteke. - 131 + 132 @@ -2936,49 +2814,49 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Add another caption Gehitu beste azpititulu bat - 146 + 147 See the subtitle file Ikusi azpitituluen fitxategia - 155 + 156 Already uploaded ✔ Jadanik igota ✔ - 159 + 160 Will be created on update Eguneratzean sortuko da - 167 + 168 Cancel create Ezeztatu sorkuntza - 169 + 170 Will be deleted on update Eguneratzean ezabatuko da - 175 + 176 Cancel deletion Ezeztatu ezabaketa - 177 + 178 @@ -2989,28 +2867,28 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Azpititulurik ez oraingoz. - 182 + 183 Captions Azpitituluak - 139 + 140 Upload thumbnail Igo irudia - 195 + 196 Upload preview Igo aurrebista - 202 + 203 @@ -3024,14 +2902,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Short text to tell people how they can support you (membership platform...). Jendeari zu nola babestu azaltzeko testu labur bat (kidetza plataforma...). - 209 + 210 Advanced settings Ezarpen aurreratuak - 190 + 191 @@ -3098,17 +2976,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 3 - - - Cancel - - - Utzi - - - 19 - - Share Partekatu @@ -3478,13 +3345,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 14 - - Error getting about from server - Errorea informazioa zerbitzaritik jasotzean - - 1 - - No description Deskripziorik ez @@ -3506,13 +3366,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Error - Errorea - - 1 - - 240p 240p @@ -3555,13 +3408,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Success - Arrakasta - - 1 - - Configuration updated. Konfigurazioa eguneratuta. @@ -3989,23 +3835,16 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Ziur ezabatu nahi duzula? Kanalera igotako bideo guztiak ezabatuko dira ere. - - 1 - - - - Please type the name of the video channel to confirm - Idatzi bideo kanalaren izena berresteko + + Video channel deleted. + bideo kanala ezabatuta. 1 - - Video channel deleted. - bideo kanala ezabatuta. + + My videos + Nire bideoak 1 @@ -4080,16 +3919,44 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Channels - Kanalak + + My library + Nire liburutegia 1 - - Video imports - Bideo inportazioak + + My channels + Nire kanalak + + 1 + + + + My subscriptions + Nire harpidetzak + + 1 + + + + Misc + Denetarik + + 1 + + + + Ownership changes + Jabetza aldaketak + + 1 + + + + My settings + Nire ezarpenak 1 @@ -4215,6 +4082,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Error + Errorea + + 1 + + You need to reconnect. Berriro konektatu behar duzu. @@ -4236,6 +4110,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Info + Informazioa + + 1 + + + + Success + Arrakasta + + 1 + + Incorrect username or password. Erabiltzaile-izen edo pasahitz okerra. @@ -4453,6 +4341,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Email is required. + E-maila behar da. + + 1 + + + + Email must be valid. + E-maila baliozkoa izan behar da. + + 1 + + Username is required. Erabiltzaile izena beha da. @@ -4474,41 +4376,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Username must be at least 3 characters long. - Erabiltzaile-izenak gutxienez 3 karaktere izan behar ditu. - - 1 - - - - Username cannot be more than 20 characters long. - Erabiltzaile-izenak ezin ditu 20 karaktere baino gehiago izan. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Erabiltzaile-izena minuskulaz dauden karaktere alfanumerikoak besterik ezin ditu izan. - - 1 - - - - Email is required. - E-maila behar da. - - 1 - - - - Email must be valid. - E-maila baliozkoa izan behar da. - - 1 - - Password must be at least 6 characters long. Pasahitza gutxienez 6 karaktere luze izan behar da. @@ -4572,20 +4439,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Display name must be at least 3 characters long. - Pantaila-izena gutxienez 3 karaktere luze izan behar da. - - 1 - - - - Display name cannot be more than 120 characters long. - Pantaila-izena ezin da 120 karaktere baino luzeagoa izan. - - 1 - - Description must be at least 3 characters long. Deskripzioa gutxienez 3 karaktere luze izan behar da. @@ -4635,13 +4488,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Report reason cannot be more than 300 characters long. - Salatzeko arrazoia ezin da 300 karaktere baino luzeagoa izan. - - 1 - - Moderation comment is required. Moderazio iruzkina derrigorrezkoa da. @@ -4656,13 +4502,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Moderation comment cannot be more than 300 characters long. - Moderazio iruzkina ezin da 300 karaktere baino luzeagoa izan. - - 1 - - The channel is required. Kanala derrigorrezkoa da. @@ -4719,27 +4558,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Name must be at least 3 characters long. - Izena gutxienez 3 karakterekoa izan behar da - - 1 - - - - Name cannot be more than 20 characters long. - Izena ezin da20 karaktere baino luzeagoa izan - - 1 - - - - Name should be only lowercase alphanumeric characters. - Izenak karaktere alfanumerikoak minuskulan besterik ezin ditu izan. - - 1 - - Support text must be at least 3 characters long. Babes testua gutxienez 3 karaktere luze izan behar da @@ -5552,13 +5370,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Subscribed - Harpidetuta - - 1 - - Subscribed to (e)ra harpidetuta @@ -5566,9 +5377,9 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Unsubscribed - Harpidetza kenduta + + Subscribed + Harpidetuta 1 @@ -5580,6 +5391,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Unsubscribed + Harpidetza kenduta + + 1 + + Moderator Moderatzailea @@ -5650,13 +5468,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Info - Informazioa - - 1 - - Upload cancelled Igoera ezeztatuta @@ -5664,13 +5475,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Sentitzen dugu, PeerTubek ezin du 8GB baino gehiagoko bideorik kudeatu - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Zure bideo-kuota bideo honekin gainditzen da (bideoaren tamaina: , erabilita: , kuota: ) diff --git a/client/src/locale/target/angular_fa_IR.xml b/client/src/locale/target/angular_fa_IR.xml index fe2d0b0cf..2a59cfc34 100644 --- a/client/src/locale/target/angular_fa_IR.xml +++ b/client/src/locale/target/angular_fa_IR.xml @@ -288,7 +288,7 @@ Password گذرواژه - 12 + 13 @@ -302,7 +302,7 @@ Login ورود - 38 + 36 @@ -330,7 +330,7 @@ Send me an email to reset my password یک رایانامه برای بازنشانی گذرواژه برای من بفرست - 75 + 80 @@ -392,7 +392,7 @@ Signup ثبت‌نام - 88 + 78 @@ -410,7 +410,7 @@ Change the language تغییر زبان - 88 + 86 @@ -421,7 +421,7 @@ نمایه‌ عمومی من - 18 + 16 @@ -432,7 +432,7 @@ حساب کاربری من - 22 + 20 @@ -443,7 +443,7 @@ ویدئو‌های من - 26 + 24 @@ -454,14 +454,14 @@ خروج - 30 + 28 Create an account ساخت حساب - 39 + 37 @@ -475,49 +475,49 @@ Subscriptions اشتراک - 47 + 45 Overview نمای‌کلی - 52 + 50 Trending مورد بحث - 57 + 55 Recently added به تازگی اضافه شده - 62 + 60 Local محلی - 67 + 65 More دیگر - 72 + 70 Administration مدیریت - 76 + 74 @@ -529,7 +529,7 @@ Toggle dark interfaceToggle dark interface - 94 + 92 @@ -613,7 +613,7 @@ No results. بدون نتیجه. - 17 + 20 @@ -659,14 +659,14 @@ Videos Overview نمای‌کلی ویدئو‌ها - 58 + 51 Local videos ویدئو‌های محلی - 61 + 54 @@ -680,7 +680,14 @@ Signup enabled ثبت‌نام فعال است - 93 + 84 + + + + Users + کاربران + + 105 @@ -694,14 +701,7 @@ Administrator مدیر - 131 - - - - Users - کاربران - - 144 + 155 @@ -715,14 +715,14 @@ Your Twitter username نام‌کاربری توییتر شما - 181 + 184 JavaScript جاوااکسریپت - 278 + 294 @@ -813,18 +813,25 @@ 14 + + My videos + ویديو‌های من + + 1 + + My settings تنظیمات من - 3 + 1 - - My videos - ویديو‌های من + + Info + راهنما - 14 + 1 @@ -1030,13 +1037,6 @@ 1 - - Info - راهنما - - 1 - - Upload cancelled بارگزاری لغوشد diff --git a/client/src/locale/target/angular_fr_FR.xml b/client/src/locale/target/angular_fr_FR.xml index 55f323009..23cfec618 100644 --- a/client/src/locale/target/angular_fr_FR.xml +++ b/client/src/locale/target/angular_fr_FR.xml @@ -227,6 +227,155 @@ 11 + + You don't have notifications. + Vous n'avez pas de notifications. + + 1 + + + + + published a new video + + + a publié une nouvelle vidéo + + + 7 + + + + + Your video has been unblacklisted + + + Votre vidéo a été débloquée + + + 11 + + + + + Your video has been blacklisted + + + Votre vidéo a été bloquée + + + 15 + + + + + A new video abuse has been created on video + + + Un nouveau signalement a été créé sur la vidéo + + + 19 + + + + + commented your video + + + a commenté votre vidéo + + + 23 + + + + + Your video has been published + + + Votre vidéo a été publiée + + + 27 + + + + + Your video import succeeded + + + Votre vidéo a été importée + + + 31 + + + + + Your video import failed + + + L'importation de votre vidéo a échoué + + + 35 + + + + + User registered on your instance + + + L'utilisateur a créé un compte sur votre instance + + + 39 + + + + + is following + + + your channel + + your account + + + suit + + + votre chaîne + + votre compte + + + 43 + + + + + mentioned you on video + + + vous a mentionné sur la vidéo + + + 52 + + + + + + + + + + + 57 + + Unlisted Non répertoriée @@ -434,6 +583,13 @@ 25 + + + + + 11 + + Login @@ -498,7 +654,7 @@ Password Mot de passe - 12 + 13 @@ -512,7 +668,7 @@ Login Se connecter - 38 + 36 @@ -522,6 +678,17 @@ 57 + + + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + Désolé, vous ne pouvez pas récupérer votre mot de passe car l'administrateur de votre instance n'a pas configuré le système de mails de PeerTube. + + + 63 + + Email Courriel @@ -540,7 +707,7 @@ Send me an email to reset my password M'envoyer un courriel pour réinitialiser mon mot de passe - 75 + 80 @@ -611,7 +778,7 @@ Signup Créer un compte - 88 + 78 @@ -681,7 +848,18 @@ Change the language Changer la langue - 88 + 86 + + + + + Help to translate PeerTube! + + + Aidez à traduire PeerTube ! + + + 8 @@ -692,7 +870,7 @@ Mon profil public - 18 + 16 @@ -703,7 +881,7 @@ Mon compte - 22 + 20 @@ -714,7 +892,7 @@ Mes vidéos - 26 + 24 @@ -725,14 +903,14 @@ Se déconnecter - 30 + 28 Create an account Créer un compte - 39 + 37 @@ -746,49 +924,49 @@ Subscriptions Abonnements - 47 + 45 Overview Vue d'ensemble - 52 + 50 Trending Tendances - 57 + 55 Recently added Récemment ajoutées - 62 + 60 Local Locales - 67 + 65 More Plus - 72 + 70 Administration Administration - 76 + 74 @@ -802,14 +980,42 @@ Show keyboard shortcuts Montrer les raccourcis clavier - 91 + 89 Toggle dark interface (Dés)activer le thème sombre - 94 + 92 + + + + View your notifications + Voir vos notifications + + 3 + + + + Notifications + Notifications + + 10 + + + + Update your notification preferences + Mettre à jour vos préférences de notification + + 15 + + + + See all your notifications + Voir toutes vos notifications + + 22 @@ -914,14 +1120,14 @@ Display unlisted and private videos Afficher les vidéos privées et non répertoriées - 11 + 14 No results. Aucun résultat. - 17 + 20 @@ -979,14 +1185,64 @@ 7 - + + Contact administrator + Contacter l'administrateur de + + 3 + + + + Your name + Votre nom + + 11 + + + + Your email + Votre mail + + 20 + + + + Your message + Votre message + + 29 + + + - About instance - + Cancel + - À propos de l'instance : + Annuler + - 1 + 26 + + + + Submit + Envoyer + + 31 + + + + About instance + À propos de l'instance + + 4 + + + + Contact administrator + Contact de l'administrateur + + 6 @@ -1000,47 +1256,47 @@ Terms Conditions d'utilisation - 44 + 39 User registration is allowed and La création de comptes utilisateurs est autorisée et - 25 + 29 - + - this instance provides a baseline quota of space for the videos of its users. - + this instance provides a baseline quota of space for the videos of its users. + - cette instance fournit un quota de base de pour les vidéos de ses utilisateurs. - + cette instance propose un quota d'espace de pour les vidéos de ses utilisateurs. + - 27 + 31 - + - this instance provides unlimited space for the videos of its users. - + this instance provides unlimited space for the videos of its users. + - cette instance met à disposition de ses utilisateurs un espace de stockage vidéo illimité. - + cette instance propose un espace illimité pour les vidéos de ses utilisateurs. + - 31 + 35 - + - User registration is currently not allowed. - + User registration is currently not allowed. + - Vous ne pouvez pas créer de comptes utilisateurs pour le moment. - + La création de nouveaux compte n'est pas autorisée pour l'instant. + - 36 + 40 @@ -1397,49 +1653,49 @@ Short description Courte description - 22 + 21 Default client route Route du client par défaut - 55 + 48 Videos Overview Vue d'ensemble des vidéos - 58 + 51 Videos Trending Vidéos tendance - 59 + 52 Videos Recently Added Vidéos récemment ajoutées - 60 + 53 Local videos Vidéos locales - 61 + 54 Policy on videos containing sensitive content Politique concernant les vidéos ayant du contenu sensible - 70 + 61 @@ -1474,23 +1730,44 @@ Signup enabled Enregistrement activé - 93 + 84 Signup requires email verification L'inscription requiert la vérification par courriel - 100 + 91 Signup limit Limitation des enregistrements + + 96 + + + + Users + Utilisateurs 105 + + User default video quota + Quota de vidéos par défaut par utilisateur + + 109 + + + + User default daily upload limit + La limite journalière de téléversement est atteinte + + 121 + + Import Importer @@ -1502,49 +1779,35 @@ Video import with HTTP URL (i.e. YouTube) enabled Import de vidéo via une URL (YouTube par exemple) activé - 120 + 141 Video import with a torrent file or a magnet URI enabled Import de vidéo avec un fichier torrent ou URL magnet activé - 127 + 148 Administrator Administrateur - 131 + 155 Admin email Email de l'administrateur - 134 + 158 - - Users - Utilisateurs + + Enable contact form + Activer le formulaire de contact - 144 - - - - User default video quota - Quota de vidéos par défaut par utilisateur - - 147 - - - - User default daily upload limit - La limite journalière de téléversement est atteinte - - 161 + 169 @@ -1565,21 +1828,32 @@ Your Twitter username Votre identifiant Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indique le compte Twitter pour le site ou la plateforme sur laquelle le contenu a été publié. - 184 + 187 Instance whitelisted by Twitter Instance sur la liste blanche de Twitter - 198 + 199 + + + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> + Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. + Si votre instance est autorisée par Twitter, un lecteur de vidéo sera inséré dans le flux Twitter pour les partages de vidéo depuis PeerTube.<br /> + Si votre instance n'est pas autorisée, une carte sera inséré avec une image et un lien vers votre instance PeerTube.<br /><br /> + Selectionnez cette case, sauvegardez la configuration et pour tester si votre instance est autorisée par Twitter, insérez l'URL d'une vidéo de votre instance (https://example.com/videos/watch/blabla) sur <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>. + + 200 @@ -1593,35 +1867,49 @@ Transcoding Encodage - 210 + 215 Transcoding enabled Encodage activé - 215 + 221 If you disable transcoding, many videos from your users will not work! Si vous désactivez le transcodage, de nombreuses vidéos d'utilisateurs ne fonctionneront pas ! - 216 + 222 + + + + Allow additional extensions + Permettre des extensions additionnelles + + 231 + + + + Allow your users to upload .mkv, .mov, .avi, .flv videos + Autoriser vos utilisateurs à publier des vidéos .mkv, .mov, .avi et .flv. + + 232 Transcoding threads Nombre de threads pour l'encodage - 223 + 237 Resolution enabled Résolution activée - 239 + 252 @@ -1636,105 +1924,105 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Certain fichiers ne sont pas fédérés (miniature, sous-titre). Nous les récupérons directement depuis l'instance d'origine et nous les gardons en cache. - 249 + 265 Previews cache size Taille du cache des prévisualisations - 254 + 271 Video captions cache size Taille du cache des sous-titres - 265 + 280 Customizations Personnalisations - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Écrivez directement du code JavaScript.<br />Exemple : <pre>console.log('mon instance est super géniale');</pre> - 281 + 297 - + - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> + Write directly CSS code. Example:<br /> + <pre> + body + background-color: red; + + </pre> - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + - Écrivez directement du code CSS. Exemple :<br /> - <pre> - body - background-color: red; - - </pre> + Écrivez directement du code CSS. Par exemple:<br /> + <pre> + body + background-color: red; + + </pre> - Ajoutez le préfixe <em>#custom-css</em> pour remplacer les styles. Exemple: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - + Ajoutez le préfixe <em>#custom-css</em> pour surcharger les styles. Par exemple: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + - 297 + 311 Advanced configuration Configuration avancée - 207 + 212 Update configuration Mettre à jour la configuration - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Il semblerait que la configuration soit invalide. Merci de chercher des erreurs potentielles dans les différents onglets. - 326 + 341 @@ -2026,11 +2314,25 @@ 133 + + User's email must be verified to login + L'adresse mail de l'utilisateur doit être vérifiée afin de se connecter + + 72 + + + + User's email is verified / User can login without email verification + L'adresse mail de l'utilisateur est vérifié / L'utilisateur peut se connecter sans vérification mail + + 76 + + Ban reason: Raison du bannissement : - 92 + 95 @@ -2097,7 +2399,7 @@ Actions Actions - 33 + 35 @@ -2132,14 +2434,14 @@ Date Date - 10 + 11 Blacklist reason: Raison de mise sur liste noire : - 41 + 43 @@ -2198,69 +2500,6 @@ 23 - - My settings - Mes paramètres - - 3 - - - - My library - Ma bibliothèque - - 7 - - - - My channels - Mes chaînes - - 12 - - - - My videos - Mes vidéos - - 14 - - - - My subscriptions - Mes abonnements - - 16 - - - - My imports - Mes imports - - 18 - - - - Misc - Divers - - 24 - - - - Muted instances - Instances muettes - - 2 - - - - Ownership changes - Changements de propriétaires - - 33 - - Video quota: Quota de vidéos : @@ -2272,21 +2511,21 @@ Profile Profil - 8 + 7 Video settings Paramètres de la vidéo - 15 + 16 Danger zone Zone dangereuse - 18 + 19 @@ -2314,13 +2553,6 @@ 35 - - Submit - Envoyer - - 24 - - - views - vues @@ -2480,6 +2712,55 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au 47 + + Muted instances + Instances muettes + + 2 + + + + History enabled + Historique activé + + 4 + + + + Delete history + Supprimer l'historique + + 8 + + + + You don't have videos history yet. + Vous n'avez pas d'historique de vidéos pour l'instant. + + 13 + + + + views + vues + + 22 + + + + Notification preferences + Préférences de notification + + 2 + + + + Mark all as read + Tout marqué comme lu + + 4 + + Change password Changer le mot de passe @@ -2578,6 +2859,20 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au 4 + + Activities + Activités + + 2 + + + + Web + Web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2686,6 +2981,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 159 + + Sorry, but something went wrong + Désolé, mais quelque chose s'est mal passé + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2722,14 +3024,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Publish will be available when upload is finished Vous pourrez publier cette vidéo lorsque l'envoi sera terminé - 53 + 58 Publish Publier - 60 + 65 @@ -2912,14 +3214,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Wait transcoding before publishing the video Attendre l'encodage avant de publier la vidéo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Si vous décidez de ne pas attendre la fin du traitement avant la publication de la vidéo, elle pourrait bien être injouable. - 131 + 132 @@ -2933,49 +3235,49 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Add another caption Ajouter un nouveau sous-titre - 146 + 147 See the subtitle file Voir le fichier de sous-titres - 155 + 156 Already uploaded ✔ Déjà téléversé ✔ - 159 + 160 Will be created on update Sera créé après la mise à jour - 167 + 168 Cancel create Annuler la création - 169 + 170 Will be deleted on update Sera supprimé après la mise à jour - 175 + 176 Cancel deletion Annuler la suppression - 177 + 178 @@ -2986,28 +3288,28 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Pas de sous-titres pour le moment. - 182 + 183 Captions Sous-titres - 139 + 140 Upload thumbnail Téléverser une vignette - 195 + 196 Upload preview Téléverser un aperçu - 202 + 203 @@ -3021,14 +3323,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Short text to tell people how they can support you (membership platform...). Courte description des moyens qu'ont les utilisateurs de vous soutenir (financement participatif, etc.). - 209 + 210 Advanced settings Paramétrage avancé - 190 + 191 @@ -3095,15 +3397,17 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 3 - + - Cancel - + Your report will be sent to moderators of . + It will be forwarded to origin instance too. + - Annuler - + Votre signalement sera envoyé aux modérateurs de . + Il sera également transmis à l'instance d'origine + - 19 + 9 @@ -3491,9 +3795,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 14 - - Error getting about from server - Erreur lors de la récupération des informations 'à propos' du serveur + + Cannot get about information from server + Impossible d'obtenir la description du serveur + + 1 + + + + Your message has been sent. + Votre message a été envoyé + + 1 + + + + You already sent this form recently + Vous avez déjà rempli ce formulaire récemment 1 @@ -3519,13 +3837,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Error - Erreur - - 1 - - 240p 240p @@ -3559,18 +3870,11 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1080p 1 - - - - Auto (via ffmpeg) - Auto (avec ffmpeg) - - 1 - - - - Success - Réussite + + + + Auto (via ffmpeg) + Auto (avec ffmpeg) 1 @@ -3841,6 +4145,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Set Email as Verified + Définir l'adresse mail comme vérifiée + + 1 + + You cannot ban root. Vous ne pouvez pas bannir root. @@ -3883,6 +4194,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + users email set as verified. + adresses mail d'utilisateurs ont été vérifiées. + + 1 + + Account unmuted. Compte réactivé. @@ -3897,6 +4215,48 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + My videos history + Mon historique de vidéos + + 1 + + + + Videos history is enabled + Historique de vidéos activé + + 1 + + + + Videos history is disabled + Historique de vidéos désactivé + + 1 + + + + Delete videos history + Supprimer l'historique de vidéos + + 1 + + + + Are you sure you want to delete all your videos history? + Êtes vous sur de vouloir supprimer toutes les vidéos de votre historique ? + + 1 + + + + Videos history deleted + Historique de vidéos supprimé + + 1 + + Ownership accepted Changement de propriété accepté @@ -3946,6 +4306,76 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + New video from your subscriptions + Nouvelle vidéo depuis vos souscriptions + + 1 + + + + New comment on your video + Nouveau commentaire sur votre vidéo + + 1 + + + + New video abuse on local video + Nouveau signalement sur une vidéo locale + + 1 + + + + One of your video is blacklisted/unblacklisted + Une de vos vidéos a été bloquée/débloquée + + 1 + + + + Video published (after transcoding/scheduled update) + Vidéo publiée (après transcodage / mise à jour programmée) + + 1 + + + + Video import finished + Import de vidéo terminé + + 1 + + + + A new user registered on your instance + Nouveau compte créé sur votre instance + + 1 + + + + You or your channel(s) has a new follower + Vous (ou votre chaîne) avez un nouveau suiveur + + 1 + + + + Someone mentioned you in video comments + Quelqu'un vous a mentionné dans les commentaires d'une vidéo + + 1 + + + + Preferences saved + Préférences sauvegardées + + 1 + + Profile updated. Profil mis à jour. @@ -3995,23 +4425,16 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Voulez-vous vraiment supprimer ? Ceci supprimera aussi toutes les vidéos téléversées dans cette chaîne. - - 1 - - - - Please type the name of the video channel to confirm - Merci de confirmer le nom de la chaîne + + Video channel deleted. + Chaîne vidéo supprimée. 1 - - Video channel deleted. - Chaîne vidéo supprimée. + + My videos + Mes vidéos 1 @@ -4086,16 +4509,58 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Channels - Chaînes + + My library + Ma bibliothèque + + 1 + + + + My channels + Mes chaînes + + 1 + + + + My subscriptions + Mes abonnements + + 1 + + + + My history + Mon historique + + 1 + + + + Misc + Divers + + 1 + + + + Ownership changes + Changements de propriétaires + + 1 + + + + My settings + Mes paramètres 1 - - Video imports - Importations de vidéos + + My notifications + Mes notifications 1 @@ -4221,6 +4686,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Error + Erreur + + 1 + + You need to reconnect. Vous devez vous reconnecter. @@ -4242,6 +4714,20 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Info + Info + + 1 + + + + Success + Réussite + + 1 + + Incorrect username or password. Nom d'utilisateur ou mot de passe incorrects. @@ -4459,6 +4945,62 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Email is required. + Le courriel est requis. + + 1 + + + + Email must be valid. + Le courriel doit être valide. + + 1 + + + + Your name is required. + Votre nom doit être rempli. + + 1 + + + + Your name must be at least 1 character long. + Votre nom doit contenir au moins un caractère. + + 1 + + + + Your name cannot be more than 120 characters long. + Votre nom ne peut pas contenir plus de 120 caractères. + + 1 + + + + A message is required. + Votre message doit être rempli. + + 1 + + + + The message must be at least 3 characters long. + Votre message doit contenir au moins 3 caractères. + + 1 + + + + The message cannot be more than 5000 characters long. + Le message ne peut pas contenir plus de 5000 caractères. + + 1 + + Username is required. Le nom d'utilisateur est requis. @@ -4480,37 +5022,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Username must be at least 3 characters long. - Le nom d'utilisateur doit être composé d'au moins 3 caractères. - - 1 - - - - Username cannot be more than 20 characters long. - Le nom d'utilisateur ne peut pas faire plus de 20 caractères. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Le nom d'utilisateur ne doit être composé que de caractères alphanumériques en minuscule. + + Username must be at least 1 character long. + Votre nom d'utilisateur doit contenir au moins un caractère. 1 - - Email is required. - Le courriel est requis. + + Username cannot be more than 50 characters long. + Votre nom d'utilisateur ne peut pas contenir plus de 50 caractères. 1 - - Email must be valid. - Le courriel doit être valide. + + Username should be lowercase alphanumeric; dots and underscores are allowed. + Le nom d'utilisateur peut contenir des minuscules, des chiffres, des points et des tirets bas. 1 @@ -4578,16 +5106,16 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Display name must be at least 3 characters long. - Le nom d'affichage doit être composé d'au moins 3 caractères. + + Display name must be at least 1 character long. + Votre nom affiché doit contenir au moins un caractère. 1 - - Display name cannot be more than 120 characters long. - Le nom d'affichage ne peut pas faire plus de 120 caractères. + + Display name cannot be more than 50 characters long. + Votre nom affiché ne peut pas contenir plus de 50 caractères. 1 @@ -4641,13 +5169,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Report reason cannot be more than 300 characters long. - La raison du signalement ne peut pas dépasser 300 caractères. - - 1 - - Moderation comment is required. Un commentaire de modération est requis. @@ -4662,13 +5183,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Moderation comment cannot be more than 300 characters long. - Le commentaire de modération doit faire au plus 300 caractères. - - 1 - - The channel is required. La chaîne est requise. @@ -4725,23 +5239,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Name must be at least 3 characters long. - Le nom doit faire au moins 3 caractères. + + Name must be at least 1 character long. + Le nom doit contenir au moins un caractère. 1 - - Name cannot be more than 20 characters long. - Le nom doit faire au plus 20 caractères. + + Name cannot be more than 50 characters long. + Le nom ne peut pas contenir plus de 50 caractères. 1 - - Name should be only lowercase alphanumeric characters. - Le nom doit contenir seulement des caractères alphanumériques minuscules. + + Name should be lowercase alphanumeric; dots and underscores are allowed. + Le nom peut contenir des minuscules, des chiffres, des points et des tirets bas. 1 @@ -5425,6 +5939,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + User email set as verified + L'adresse mail de l'utilisateur a été vérifiée + + 1 + + Account muted. Comptes muets. @@ -5551,13 +6072,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Subscribed - Abonné - - 1 - - Subscribed to Abonné à @@ -5565,9 +6079,9 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Unsubscribed - Désabonné + + Subscribed + Abonné 1 @@ -5579,6 +6093,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Unsubscribed + Désabonné + + 1 + + Moderator Modérateur @@ -5607,6 +6128,20 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Bienvenue ! Veuillez maintenant consulter vos mails afin de vérifier votre compte et compéter l'inscription. + + 1 + + + + You are now logged in as ! + Vous êtes maintenant connecté en tant que ! + + 1 + + Video to import updated. Les vidéos à importer ont été mises à jour @@ -5635,13 +6170,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Info - Info - - 1 - - Upload cancelled Mise en ligne annulée @@ -5649,13 +6177,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Désolé, mais PeerTube ne gère pas les vidéos d'une taille > 8 Go - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Votre quota est dépassé avec cette vidéo (taille de la vidéo : , used: , quota: ) diff --git a/client/src/locale/target/angular_gl_ES.xml b/client/src/locale/target/angular_gl_ES.xml index e2695304b..ab07180b2 100644 --- a/client/src/locale/target/angular_gl_ES.xml +++ b/client/src/locale/target/angular_gl_ES.xml @@ -103,7 +103,7 @@ Password Contrasinal - 12 + 13 @@ -117,7 +117,7 @@ Login Conectar - 38 + 36 @@ -145,7 +145,7 @@ Send me an email to reset my password Envíenme un correo para restablecer o contrasinal - 75 + 80 @@ -202,7 +202,7 @@ Signup Abrir conta - 88 + 78 @@ -238,14 +238,14 @@ Change the language Cambiar o idioma - 88 + 86 Create an account Crear unha conta - 39 + 37 @@ -259,35 +259,35 @@ Trending En voga - 57 + 55 Recently added Últimos engadidos - 62 + 60 Local Local - 67 + 65 More Máis - 72 + 70 Administration Administración - 76 + 74 @@ -399,7 +399,7 @@ No results. Sin resultados. - 17 + 20 @@ -416,17 +416,6 @@ 7 - - - About instance - - - Acerca da instancia - - - 1 - - Description Descrición @@ -438,47 +427,14 @@ Terms Termos - 44 + 39 User registration is allowed and O rexistro está aberto e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - esta instancia proporciona unha cota inicial de para os vídeos das súas usuarias. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - esta instancia non limita o espazo para os videos das súas usuarias. - - - 31 - - - - - User registration is currently not allowed. - - - En este momento non está aberto o rexistro de novas usuarias. - - - 36 + 29 @@ -744,42 +700,42 @@ Short description Descrición curta - 22 + 21 Default client route Ruta ao cliente por omisión - 55 + 48 Videos Trending Vídeos de moda - 59 + 52 Videos Recently Added Vídeos engadidos recentemente - 60 + 53 Local videos Vídeos en local - 61 + 54 Policy on videos containing sensitive content Política para os vídeos con contido sensible - 70 + 61 @@ -814,16 +770,30 @@ Signup enabled Rexistro activado - 93 + 84 Signup limit Rexistro limitado + + 96 + + + + Users + Usuarias 105 + + User default video quota + Cota de vídeo por omisión para a usuaria + + 109 + + Import Importar @@ -835,35 +805,21 @@ Video import with a torrent file or a magnet URI enabled Importación de vídeo con un ficheiro torrent ou URI magnet activada - 127 + 148 Administrator Administración - 131 + 155 Admin email Correo-e da Admin - 134 - - - - Users - Usuarias - - 144 - - - - User default video quota - Cota de vídeo por omisión para a usuaria - - 147 + 158 @@ -884,21 +840,21 @@ Your Twitter username O seu alcume na Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica a conta na Twitter para o sitio web ou plataforma para a cal o contido foi publicado. - 184 + 187 Instance whitelisted by Twitter Instancia na lista blanca por Twitter - 198 + 199 @@ -912,98 +868,98 @@ Transcoding Recodificando - 210 + 215 Transcoding enabled Recodificación activada - 215 + 221 If you disable transcoding, many videos from your users will not work! Si desactiva a recodificación moitos vídeos das súas usuarias non funcionarán! - 216 + 222 Transcoding threads Fíos de recodificación - 223 + 237 Resolution enabled Resolución activada - 239 + 252 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Algúns ficheiros non se federan (vista previa, comentarios). Recollémolos directamente desde a instancia de orixe e almacenámolos. - 249 + 265 Previews cache size Tamaño da caché de vista previa - 254 + 271 Video captions cache size Tamaño da caché de comentarios no vídeo - 265 + 280 Customizations Personalizacións - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escribir código JavaScript directamente.<br />Exemplo: <pre>console.log('a miña instancia é tremenda');</pre> - 281 + 297 Advanced configuration Configuración avanzada - 207 + 212 Update configuration Actualizar configuración - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Semella que a configuración non é válida. Por favor busque os erros potenciais nas diferentes pestanas. - 326 + 341 diff --git a/client/src/locale/target/angular_it_IT.xml b/client/src/locale/target/angular_it_IT.xml index 2f5178484..c3bcc704c 100644 --- a/client/src/locale/target/angular_it_IT.xml +++ b/client/src/locale/target/angular_it_IT.xml @@ -479,7 +479,7 @@ Password Password - 12 + 13 @@ -493,7 +493,7 @@ Login Accedi - 38 + 36 @@ -521,7 +521,7 @@ Send me an email to reset my password Inviami un email per resettare la password - 75 + 80 @@ -585,7 +585,7 @@ Signup Registrati - 88 + 78 @@ -655,7 +655,7 @@ Change the language Cambia lingua - 88 + 86 @@ -666,7 +666,7 @@ Il mio profilo pubblico - 18 + 16 @@ -677,7 +677,7 @@ Il mio account - 22 + 20 @@ -688,7 +688,7 @@ I miei video - 26 + 24 @@ -699,14 +699,14 @@ Esci - 30 + 28 Create an account Crea un account - 39 + 37 @@ -720,49 +720,49 @@ Subscriptions Iscrizioni - 47 + 45 Overview Panoramica - 52 + 50 Trending Popolari - 57 + 55 Recently added Aggiunti di recente - 62 + 60 Local Locali - 67 + 65 More Altro - 72 + 70 Administration Amministrazione - 76 + 74 @@ -776,14 +776,14 @@ Show keyboard shortcuts Mostra scorciatoie della tastiera - 91 + 89 Toggle dark interface (Dis)attiva l'interfaccia sicura - 94 + 92 @@ -888,14 +888,14 @@ Display unlisted and private videos Mostra video privati e non elencati - 11 + 14 No results. Nessun risultato. - 17 + 20 @@ -953,15 +953,22 @@ 7 - + - About instance - + Cancel + - Riguardo all'istanza - + Annulla + - 1 + 26 + + + + Submit + Invia + + 31 @@ -975,47 +982,14 @@ Terms Termini - 44 + 39 User registration is allowed and È permessa la registrazione di nuovi utenti e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - questa istanza fornisce una quota base di per i video dei suoi utenti. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - questa istanza fornisce spazio illimitato per i video dei suoi utenti. - - - 31 - - - - - User registration is currently not allowed. - - - La registrazione di nuovi utenti al momento non è permessa. - - - 36 + 29 @@ -1359,49 +1333,49 @@ Short description Breve descrizione - 22 + 21 Default client route Percorso predefinito del client - 55 + 48 Videos Overview Panoramica dei video - 58 + 51 Videos Trending Video popolari - 59 + 52 Videos Recently Added Video aggiunti di recente - 60 + 53 Local videos Video locali - 61 + 54 Policy on videos containing sensitive content Policy su video che contengono contenuti sensibili - 70 + 61 @@ -1436,23 +1410,44 @@ Signup enabled Registrazione abilitata - 93 + 84 Signup requires email verification La registrazione richiede una verifica via email - 100 + 91 Signup limit Limite registrazioni + + 96 + + + + Users + Utenti 105 + + User default video quota + Quota standard per i video dell'utente + + 109 + + + + User default daily upload limit + Limite giornaliero per il caricamento + + 121 + + Import Carica @@ -1464,49 +1459,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Importazione video con indirizzo HTTP (es. YouTube) abilitata - 120 + 141 Video import with a torrent file or a magnet URI enabled Carica video con un file torrent o un URI magnete attivo - 127 + 148 Administrator Amministratore - 131 + 155 Admin email Email Amministratore - 134 - - - - Users - Utenti - - 144 - - - - User default video quota - Quota standard per i video dell'utente - - 147 - - - - User default daily upload limit - Limite giornaliero per il caricamento - - 161 + 158 @@ -1527,21 +1501,21 @@ Your Twitter username Il tuo username Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica l'account Twitter per il sito web o la piattaforma in cui il contenuto e' stato pubblicato. - 184 + 187 Instance whitelisted by Twitter Istanza inserita in white list da Twitter - 198 + 199 @@ -1555,35 +1529,35 @@ Transcoding Trascrizione - 210 + 215 Transcoding enabled Trascrizione attivata - 215 + 221 If you disable transcoding, many videos from your users will not work! Se disatitvi la trascrizione, molti video dai tuoi utenti non funzioneranno. - 216 + 222 Transcoding threads Trascrizione thread - 223 + 237 Resolution enabled Risoluzione abilitata - 239 + 252 @@ -1598,82 +1572,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Alcuni file non sono federati (anteprime, sottotitoli). Li recuperiamo direttamente dall'istanza di origine e li mettiamo in cache. - 249 + 265 Previews cache size Dimensione del cache per la previsualizzazione - 254 + 271 Video captions cache size Dimensione - 265 + 280 Customizations Personalizzazioni - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Scrivi direttamente codice JavaScript .<br />Esempio: <pre>console.log('La mia istanza spacca!');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Scrivi direttamente codice CSS .Esempio:<br /> - <pre> - body - background-color: red; - - </pre> - - Precedi con <em>#custom-css</em> per sovrascrivere stili. Esempio: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1682,21 +1621,21 @@ Advanced configuration Configurazione avanzata - 207 + 212 Update configuration Aggiorna configurazione - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Sembra che la configurazione sia valida. Per favore cerca potenziali errori nelle altre tab - 326 + 341 @@ -1979,7 +1918,7 @@ Ban reason: Motivo ban: - 92 + 95 @@ -2044,7 +1983,7 @@ Actions Azioni - 33 + 35 @@ -2079,14 +2018,14 @@ Date Data - 10 + 11 Blacklist reason: motivo per essere in Blacklist: - 41 + 43 @@ -2138,69 +2077,6 @@ 23 - - My settings - Le mie impostazioni - - 3 - - - - My library - La mia libreria - - 7 - - - - My channels - I miei canali - - 12 - - - - My videos - I miei video - - 14 - - - - My subscriptions - Le mie sottoscrizioni - - 16 - - - - My imports - Le mie importazioni - - 18 - - - - Misc - Altro - - 24 - - - - Muted instances - Istanze silenziate - - 2 - - - - Ownership changes - Cambi di proprietario - - 33 - - Video quota: Quota video: @@ -2212,21 +2088,21 @@ Profile Profilo - 8 + 7 Video settings Impostazione video - 15 + 16 Danger zone Zona pericolosa - 18 + 19 @@ -2254,13 +2130,6 @@ 35 - - Submit - Invia - - 24 - - - views - visualizzazioni @@ -2420,6 +2289,13 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v 47 + + Muted instances + Istanze silenziate + + 2 + + Change password Cambia password @@ -2650,14 +2526,14 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Publish will be available when upload is finished La pubblicazione sarà disponibile quando il caricamento sarà completato - 53 + 58 Publish Pubblica - 60 + 65 @@ -2836,12 +2712,12 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Wait transcoding before publishing the videoWait transcoding before publishing the video - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. - 131 + 132 @@ -2855,45 +2731,45 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Add another caption Aggiungi un'altra descrizione - 146 + 147 See the subtitle file Guarda il file dei sottotitoli - 155 + 156 Cancel create Annulla creazione - 169 + 170 Cancel deletion Annulla creazione - 177 + 178 CaptionsCaptions - 139 + 140 Upload thumbnail Carica miniatura - 195 + 196 Upload previewUpload preview - 202 + 203 @@ -2905,14 +2781,14 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Short text to tell people how they can support you (membership platform...).Short text to tell people how they can support you (membership platform...). - 209 + 210 Advanced settings Impostazioni avanzate - 190 + 191 @@ -2972,17 +2848,6 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v 3 - - - Cancel - - - Annulla - - - 19 - - Share Condividi @@ -3305,13 +3170,6 @@ Altri video 14 - - Error getting about from server - Errore durante la comunicazione con il server - - 1 - - No description Nessuna descrizione @@ -3333,13 +3191,6 @@ Altri video 1 - - Error - Errore - - 1 - - 240p 240p @@ -3354,11 +3205,6 @@ Altri video 1 - - SuccessSuccess - 1 - - Configuration updated. Configurazione aggiornata. @@ -3724,23 +3570,16 @@ Altri video 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Vuoi veramente eliminare ? Questo eliminerá anche tutti i video caricati su questo canale. - - 1 - - - - Please type the name of the video channel to confirm - Per favore digita il nome del canale video per confermare + + Video channel deleted. + Il canale video è stato cancellato. 1 - - Video channel deleted. - Il canale video è stato cancellato. + + My videos + I miei video 1 @@ -3811,16 +3650,44 @@ Altri video 1 - - Channels - Canali + + My library + La mia libreria + + 1 + + + + My channels + I miei canali + + 1 + + + + My subscriptions + Le mie sottoscrizioni + + 1 + + + + Misc + Altro + + 1 + + + + Ownership changes + Cambi di proprietario 1 - - Video imports - Caricamenti video + + My settings + Le mie impostazioni 1 @@ -3862,6 +3729,13 @@ Altri video 1 + + Error + Errore + + 1 + + You need to reconnect. Devi riconnetterti. @@ -3883,6 +3757,18 @@ Altri video 1 + + Info + Informazioni + + 1 + + + + SuccessSuccess + 1 + + Incorrect username or password. Username or password non corretti @@ -4100,6 +3986,20 @@ Altri video 1 + + Email is required. + L'email è richiesta. + + 1 + + + + Email must be valid. + L'email deve essere valida. + + 1 + + Username is required. L'username è necessario. @@ -4121,41 +4021,6 @@ Altri video 1 - - Username must be at least 3 characters long. - L'username deve essere almeno di 3 caratteri. - - 1 - - - - Username cannot be more than 20 characters long. - L'username non può essere più di 20 caratteri. - - 1 - - - - Username should be only lowercase alphanumeric characters. - L'username dovrebbe essere solo in minuscolo e contenere solo alfanumerici. - - 1 - - - - Email is required. - L'email è richiesta. - - 1 - - - - Email must be valid. - L'email deve essere valida. - - 1 - - Password must be at least 6 characters long. La password deve essere lunga almeno 6 caratteri. @@ -4219,16 +4084,6 @@ Altri video 1 - - Display name must be at least 3 characters long.Display name must be at least 3 characters long. - 1 - - - - Display name cannot be more than 120 characters long.Display name cannot be more than 120 characters long. - 1 - - Description must be at least 3 characters long. La descrizione deve avere al minino 3 caratteri. @@ -4271,13 +4126,6 @@ Altri video 1 - - Report reason cannot be more than 300 characters long. - Il motivo per la segnalazione non può essere più lungo di 300 caratteri. - - 1 - - Moderation comment is required. Il commento di moderazione è richiesto. @@ -4292,13 +4140,6 @@ Altri video 1 - - Moderation comment cannot be more than 300 characters long. - Il commento di moderazione non può essere più lungo di 300 caratteri. - - 1 - - The channel is required. Il canale è richiesto. @@ -4320,27 +4161,6 @@ Altri video 1 - - Name must be at least 3 characters long. - Il nome deve essere al minimo lunguo di tre caratteri. - - 1 - - - - Name cannot be more than 20 characters long. - Il nome non deve superare i 20 caratteri. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Il nome deve contenire solo caratteri minuscoli ed alfanumerichi; - - 1 - - Comment is required. Un commento è necessario. @@ -5000,13 +4820,6 @@ Altri video 1 - - Subscribed - Iscritto - - 1 - - Subscribed to Iscritto a @@ -5014,9 +4827,9 @@ Altri video 1 - - Unsubscribed - Disiscritto + + Subscribed + Iscritto 1 @@ -5028,6 +4841,13 @@ Altri video 1 + + Unsubscribed + Disiscritto + + 1 + + Moderator Moderatore @@ -5084,13 +4904,6 @@ Altri video 1 - - Info - Informazioni - - 1 - - Upload cancelled Caricamento annullato. @@ -5098,13 +4911,6 @@ Altri video 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Ci dispiace ma PeerTube non può gestire video di dimensioni > 8GB - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) La tua quota è stata superata con questo video (dimensione del video: , stai utilizzando: , quota: ) diff --git a/client/src/locale/target/angular_ja_JP.xml b/client/src/locale/target/angular_ja_JP.xml index d0b592098..04bd5089a 100644 --- a/client/src/locale/target/angular_ja_JP.xml +++ b/client/src/locale/target/angular_ja_JP.xml @@ -342,7 +342,7 @@ Password パスワード - 12 + 13 @@ -356,7 +356,7 @@ Login ログイン - 38 + 36 @@ -382,7 +382,7 @@ Send me an email to reset my password 新しいパスワードをメールで送る - 75 + 80 @@ -444,7 +444,7 @@ Signup サインアップ - 88 + 78 @@ -456,7 +456,7 @@ Change the languageChange the language - 88 + 86 @@ -465,7 +465,7 @@ マイアカウント - 22 + 20 @@ -474,7 +474,7 @@ マイビデオ - 26 + 24 @@ -483,14 +483,14 @@ ログアウト - 30 + 28 Create an account アカウントを作成する - 39 + 37 @@ -504,47 +504,47 @@ Subscriptions サブスクリプション - 47 + 45 Overview 調査 - 52 + 50 TrendingTrending - 57 + 55 Recently added 最近追加された - 62 + 60 Local 地元 - 67 + 65 More 多くの - 72 + 70 Administration 運営 - 76 + 74 @@ -635,7 +635,7 @@ No results. 結果がありません。 - 17 + 20 @@ -682,6 +682,24 @@ 7 + + + Cancel + + + キャンセル + + + 26 + + + + Submit + 差し出す + + 31 + + Description 説明 @@ -693,23 +711,14 @@ Terms 条項 - 44 + 39 User registration is allowed and ユーザー登録が可能です - 25 - - - - - User registration is currently not allowed. - - ユーザー登録は現在受け付けておりません - - 36 + 29 @@ -762,14 +771,14 @@ Short description 簡単な説明 - 22 + 21 Videos Overview ビデオの概要 - 58 + 51 @@ -790,19 +799,26 @@ Signup enabled サインアップが有効 - 93 + 84 Signup requires email verification サインアップには電子メールの確認が必要です - 100 + 91 Signup limit サインアップの制限 + + 96 + + + + Users + ユーザー 105 @@ -818,28 +834,21 @@ Video import with a torrent file or a magnet URI enabled Torrent ファイル または magnet リンクを使用して動画をインポートする - 127 + 148 Administrator 管理者 - 131 + 155 Admin email 管理者の電子メール - 134 - - - - Users - ユーザー - - 144 + 158 @@ -860,7 +869,7 @@ Your Twitter username あなたのTwitterユーザー名 - 181 + 184 @@ -874,47 +883,47 @@ Transcoding トランスコード - 210 + 215 Transcoding enabled トランスコードが有効になっています - 215 + 221 Transcoding threadsTranscoding threads - 223 + 237 Customizations カスタマイズ - 275 + 289 JavaScript JavaScript - 278 + 294 Advanced configuration 高度な構成 - 207 + 212 Update configuration 設定を更新する - 325 + 340 @@ -1037,7 +1046,7 @@ Ban reason: 禁止理由： - 92 + 95 @@ -1086,7 +1095,7 @@ Actions 行動 - 33 + 35 @@ -1110,46 +1119,25 @@ 2 - - My subscriptions - 私の輸入品 - - 16 - - - - My imports - 私の購読 - - 18 - - - - Ownership changes - 所有権の変更 - - 33 - - Profile プロフィール - 8 + 7 Video settings ビデオ設定 - 15 + 16 Danger zone 危険区域 - 18 + 19 @@ -1159,13 +1147,6 @@ 46 - - Submit - 差し出す - - 24 - - Cancel @@ -1307,7 +1288,7 @@ Publish 出す - 60 + 65 @@ -1384,17 +1365,6 @@ 3 - - - Cancel - - - キャンセル - - - 19 - - Share シェア @@ -1573,13 +1543,6 @@ 14 - - Error getting about from server - サーバーからのエラー - - 1 - - No description 説明はありません @@ -1594,20 +1557,6 @@ 1 - - Error - エラー - - 1 - - - - Success - 成功 - - 1 - - Configuration updated. 構成が更新されました。 @@ -1690,9 +1639,16 @@ 1 - - Channels - チャンネル + + My subscriptions + 私の輸入品 + + 1 + + + + Ownership changes + 所有権の変更 1 @@ -1712,6 +1668,13 @@ 1 + + Error + エラー + + 1 + + You need to reconnect. 再接続する必要があります。 @@ -1726,6 +1689,20 @@ 1 + + Info + 情報 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. ユーザーネームまたはパスワードが違います。 @@ -1796,6 +1773,20 @@ 1 + + Email is required. + 電子メールが必要です。 + + 1 + + + + Email must be valid. + 電子メールは有効である必要があります。 + + 1 + + Username is required. ユーザー名は必須です。 @@ -1817,41 +1808,6 @@ 1 - - Username must be at least 3 characters long. - ユーザー名は3文字以上でなければなりません。 - - 1 - - - - Username cannot be more than 20 characters long. - ユーザー名の長さは20文字を超えることはできません。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - ユーザー名は小文字の英数字でなければなりません。 - - 1 - - - - Email is required. - 電子メールが必要です。 - - 1 - - - - Email must be valid. - 電子メールは有効である必要があります。 - - 1 - - Password must be at least 6 characters long. パスワードは6文字以上でなければなりません。 @@ -2419,16 +2375,16 @@ 1 - - Subscribed - 購読する + + Subscribed to + の登録が完了しました。 1 - - Subscribed to - の登録が完了しました。 + + Subscribed + 購読する 1 @@ -2461,13 +2417,6 @@ 1 - - Info - 情報 - - 1 - - Upload cancelled アップロードのキャンセル @@ -2475,13 +2424,6 @@ 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 申し訳ありませんが、PeerTube は動画を処理出来ません。 > 8GB - - 1 - - Video published. ビデオが公開されました。 diff --git a/client/src/locale/target/angular_jbo.xml b/client/src/locale/target/angular_jbo.xml index 83e61a714..6478b002c 100644 --- a/client/src/locale/target/angular_jbo.xml +++ b/client/src/locale/target/angular_jbo.xml @@ -33,7 +33,7 @@ Next month - la bavla'ima'i + lo bavla'ima'i 27 @@ -53,9 +53,7 @@ - «« - «« - + «««« 7 @@ -67,9 +65,7 @@ - « - « - + «« 15 @@ -81,9 +77,7 @@ - » - » - + »» 29 @@ -95,9 +89,7 @@ - »» - »» - + »»»» 36 @@ -237,6 +229,48 @@ sisti lo nu jersi pe'a 13 + + User registration is not allowed on this instance, but you can register on many others! + .i le samtcise'u cu curmi no nu cmiveigau .i ku'i do cmeveigau fo so'i drata ka'e + + 28 + + + + Password + lo lerpoijaspu + + 13 + + + + I forgot my password + .i mi nalmo'i le mi lerpoijaspu + + 44 + + + + Login + co'a cmisau + + 36 + + + + Forgot your password + .i mi nalmo'i le mi lerpoijaspu + + 57 + + + + Email + lo ve samymri + + 8 + + Email address lo ve samymri @@ -248,7 +282,7 @@ sisti lo nu jersi pe'a Send me an email to reset my password samymri fi mi te zu'e lo nu galfi le mi japyvla - 75 + 80 @@ -299,6 +333,13 @@ zbasu lo pilno 55 + + Signup + cmiveigau + + 78 + + results lo te facki @@ -327,7 +368,7 @@ zbasu lo pilno Change the language galfi lo bangu - 88 + 86 @@ -337,7 +378,7 @@ zbasu lo pilno lo predatni be mi be'o poi gubni - 18 + 16 @@ -347,7 +388,7 @@ lo predatni be mi be'o poi gubni lo mi pilno - 22 + 20 @@ -357,14 +398,14 @@ lo mi pilno lo mi vidvi - 26 + 24 Create an account zbasu lo pilno - 39 + 37 @@ -378,28 +419,28 @@ lo mi vidvi Subscriptions lo se jersi pe'a - 47 + 45 Trending lo cabna misno - 57 + 55 Local lo diklo - 67 + 65 More lo drata - 72 + 70 @@ -476,7 +517,7 @@ lo mi vidvi No results. .i facki fi no da - 17 + 20 @@ -498,26 +539,6 @@ lo mi vidvi 27 - - - this instance provides unlimited space for the videos of its users. - - - .i le vi samtcise'u cu sabji lo na'e se jimte ke vidvi datni canlu lo pilno be sy. - - 31 - - - - - User registration is currently not allowed. - - - .i ca na'e curmi lo nu zbasu lo pilno - - 36 - - About PeerTube @@ -638,28 +659,28 @@ lo mi vidvi Short description lo cmalu ve skicu - 22 + 21 Local videos lo diklo vidvi - 61 + 54 Policy on videos containing sensitive content loi javni be tu'a lo vidvi poi vasru lo ganvi poi te kajde - 70 + 61 JavaScript la .djavascript. - 278 + 294 @@ -686,53 +707,18 @@ lo pilno 12 - - My settings - lo mi se cuxna - - 3 - - - - My channels - lo mi te tivni - - 12 - - - - My videos - lo mi vidvi - - 14 - - - - My subscriptions - lo se jersi pe'a be mi - - 16 - - - - My imports - lo se nerbei be mi - - 18 - - Profile lo predatni - 8 + 7 Video settings lo se cuxna pe lo vidvi - 15 + 16 @@ -942,14 +928,14 @@ lo pilno Cancel create co'u zbasu - 169 + 170 Cancel deletion co'u vimcu - 177 + 178 @@ -963,7 +949,7 @@ lo pilno Advanced settings lo certu se cuxna - 190 + 191 @@ -1104,13 +1090,6 @@ lo pilno 14 - - Error - .i srera - - 1 - - 100MB pa no no lo megbivysamsle @@ -1195,6 +1174,27 @@ lo pilno 1 + + Delete this report + vimcu le notci + + 1 + + + + Do you really want to delete this abuse report? + .i .au ju'o pei vimcu le malpli notci + + 1 + + + + Abuse deleted. + .i mo'u vimcu le malpli notci + + 1 + + Password updated. .i mo'u galfi lo japyvla @@ -1237,23 +1237,30 @@ lo pilno 1 - - Create - zbasu + + Video channel created. + .i mo'u zbasu la'o ly. .ly. noi vidvi te tivni + + 1 + + + + This name already exists on this instance. + .i le cmene xa'o zasti ci'e le mupli 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - .i .au ju'o pei do vimcu la'o ly. .ly. .i la'e di'u vimcu ro lo vidvi ji'a poi se kibdu'a fi le vi te tivni + + Create + zbasu 1 - - Please type the name of the video channel to confirm - .i .e'o ko ciska le cmene be le vidvi te zu'e lo nu birti + + Video channel updated. + .i mo'u galfi la'o ly. .ly. noi vidvi te tivni 1 @@ -1265,6 +1272,13 @@ lo pilno 1 + + My videos + lo mi vidvi + + 1 + + Do you really want to delete videos? .i .au ju'o pei do vimcu lo vidvi @@ -1279,16 +1293,23 @@ lo pilno 1 - - Channels - lo te tivni + + My channels + lo mi te tivni 1 - - Video imports - lo vidvi poi se nerbei + + My subscriptions + lo se jersi pe'a be mi + + 1 + + + + My settings + lo mi se cuxna 1 @@ -1335,6 +1356,13 @@ lo pilno 1 + + Error + .i srera + + 1 + + Your password has been successfully reset! .i snada lo nu mo'u galfi le do japyvla @@ -1342,5 +1370,19 @@ lo pilno 1 + + The channel is required. + .i le vidvi te tivni cu sarcu + + 1 + + + + Video channel is required. + .i le vidvi te tivni cu sarcu + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_nl_NL.xml b/client/src/locale/target/angular_nl_NL.xml index 3db9f0504..7e7a6abdd 100644 --- a/client/src/locale/target/angular_nl_NL.xml +++ b/client/src/locale/target/angular_nl_NL.xml @@ -3,6 +3,244 @@ + + Close + Sluiten + + 2 + + + + Previous + Vorige + + 13 + + + + Next + Volgende + + 17 + + + + Previous month + Vorige maand + + 5 + + + + Next month + Volgende maand + + 27 + + + + Select month + Selecteer maand + + 7 + + + + Select year + Selecteer jaar + + 16 + + + + «« + «« + + 7 + + + + First + Eerste + + 5 + + + + « + « + + 15 + + + + Previous + Vorige + + 13 + + + + » + » + + 29 + + + + Next + Volgende + + 27 + + + + »» + »» + + 36 + + + + Last + Laatste + + 34 + + + + % + % + + 6 + + + + Increment hours + Verhoog uren + + 9 + + + + HH + HH + + 12 + + + + Hours + Uren + + 14 + + + + Decrement hours + Verlaag uren + + 19 + + + + Increment minutes + Verhoog minuten + + 28 + + + + MM + MM + + 31 + + + + Minutes + Minuten + + 33 + + + + Decrement minutes + Verlaag minuten + + 38 + + + + Increment seconds + Verhoog seconden + + 47 + + + + SS + SS + + 50 + + + + Seconds + Seconden + + 52 + + + + Decrement seconds + Verlaag seconden + + 57 + + + + PM + PM + + 65 + + + + AM + AM + + 66 + + + + Cancel + Annuleren + + 10 + + + + (extensions: , max size: ) + (extensies: , max grootte: ) + + 11 + + + + Unlisted + Onvermeld + + 10 + + + + Private + Privé + + 11 + + - views - keer bekeken @@ -45,6 +283,105 @@ 19 + + + + Subscribe + + + + + + + + Abonneer + + + + + + 5 + + + + + Unsubscribe + + +Abonnement opzeggen + + 18 + + + + Using an ActivityPub account + Een ActivityPub-account gebruiken + + 36 + + + + Subscribe with an account on + Abonneer met een account op + + 39 + + + + Subscribe with your local account + Abonneer met je lokale account + + 40 + + + + Subscribe with a Mastodon account: + Abonneer met een Mastodon-account + + 43 + + + + Using a syndication feed + Een syndicaatfeed gebruiken + + 48 + + + + Subscribe via RSS + Abonneren met RSS + + 49 + + + + + Remote subscribe + Remote interact + + +Extern abonneren + Externe interactie + + + 10 + + + + You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there. + Je kan op het kanaal abonneren via elke ActivityPub-mogelijke fediverse instantie. Bijvoorbeeld met Mastodon of Pleroma kan je de URL van het kanaal in de zoekbalk invullen en daar abonneren. + + 17 + + + + You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there. + Je kan hiermee interactie hebben via elke ActivityPub-mogelijke fediverse instantie. Bijvoorbeeld met Mastodon of Pleroma kan je de huidige URL in de zoekbalk typen en er daar interactie mee hebben. + + 22 + + Video quota Videoquotum @@ -52,15 +389,65 @@ 42 + + + Unlimited ( per day) + + +Oneindig ( per dag) + + + 14 + + + + Ban + Verbannen + + 3 + + + + Reason... + Reden... + + 11 + + + + + A banned user will no longer be able to login. + + +Een verbannen gebruiker kan niet langer inloggen. + + 17 + + + + Ban this user + Verban deze gebruiker + + 25 + + Login - Aanmelden + +Aanmelden 2 + + Request new verification email. + Een nieuwe verificatie e-mail aanvragen. + + 12 + + User Gebruiker @@ -79,7 +466,8 @@ or create an account - of maak een account + +of maak een account 18 @@ -88,14 +476,15 @@ or create an account on another instance - of maak een account aan op een andere server + +of maak een account aan op een andere instantie 22 User registration is not allowed on this instance, but you can register on many others! - Registratie is niet mogelijk op deze instantie, maar je kan een account maken op een van de vele anderen! + Registratie is niet mogelijk op deze instantie, maar je kan wel registreren op een van de vele anderen! 28 @@ -104,12 +493,12 @@ Password Wachtwoord - 12 + 13 I forgot my password - Wachtwoord vergeten + Ik ben mijn wachtwoord vergeten 44 @@ -118,12 +507,12 @@ Login Aanmelden - 38 + 36 Forgot your password - Wachtwoord vergeten + Jouw wachtwoord vergeten 57 @@ -146,14 +535,15 @@ Send me an email to reset my password Zend me een e-mail om een nieuw wachtwoord in te stellen - 75 + 80 Reset my password - Wachtwoord opnieuw instellen + +Wachtwoord opnieuw instellen 2 @@ -183,7 +573,8 @@ Create an account - Account maken + +Account aanmaken 3 @@ -195,60 +586,195 @@ 8 - - Signup - Registratie + + Example: jane_doe + Bijvoorbeeld: jane-doe - 88 + 17 - - Change the language - Taal veranderen + + I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance + Ik ben minstens 16 jaar oud en accepteer de <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Voorwaarden</a> van deze instantie - 88 + 55 - - Create an account - Account maken + + Signup + Registratie - 39 + 78 - - Videos - Video's + + Features found on this instance + Kenmerken van deze instantie - 24 + 67 - - Trending - Populair + + results + resultaten - 57 + 5 - - Recently added - Recent toegevoegd + + + for + + +voor - 62 + 6 + + + + + Filters + + + + Filters + + + 16 + + + + + No results found + + +Geen resultaten gevonden + + 28 + + + + subscribers + abonnees + + 44 + + + + - views + - weergaven + + 55 + + + + Change the language + Taal veranderen + + 86 + + + + + My public profile + + +Mijn openbare profiel + + 16 + + + + + My account + + +Mijn account + + 20 + + + + + My videos + + +Mijn video's + + 24 + + + + + Log out + + +Uitloggen + + 28 + + + + Create an account + Account maken + + 37 + + + + Videos + Video's + + 24 + + + + Subscriptions + Abonnementen + + 45 + + + + Overview + Overzicht + + 50 + + + + Trending + Populair + + 55 + + + + Recently added + Recent toegevoegd + + 60 Local Lokaal - 67 + 65 + + + + More + Meer + + 70 Administration Administratie - 76 + 74 @@ -258,6 +784,20 @@ 25 + + Show keyboard shortcuts + Laat keyboard shortcuts zien + + 89 + + + + Toggle dark interface + Schakel donkere interface aan of uit + + 92 + + Search... Zoeken … @@ -272,6 +812,48 @@ 9 + + Sort + Sorteren + + 6 + + + + Published date + Datum van publicatie + + 15 + + + + Duration + Duratie + + 24 + + + + Display sensitive content + Laat gevoelige inhoud zien + + 33 + + + + Yes + Ja + + 37 + + + + No + Nee + + 42 + + Category Categorie @@ -293,11 +875,77 @@ 182 + + All of these tags + Al deze tags + + 82 + + + + One of these tags + Een van deze tags + + 87 + + + + Filter + Filter + + 94 + + + + Display unlisted and private videos + Laat onvermelde en privé-video's zien + + 14 + + No results. Geen resultaten. - 17 + 20 + + + + + + + + + + 6 + + + + + # + + +# + + 14 + + + + + + + + + + + + + + + + + + 22 @@ -314,13 +962,21 @@ 7 - + - About instance - - Over de instantie + Cancel + + +Annuleer - 1 + 26 + + + + Submit + Voorleggen + + 31 @@ -334,48 +990,24 @@ Terms Voorwaarden - 44 + 39 User registration is allowed and Een account aanmaken is mogelijk en - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - deze instantie voorziet een basis-opslagquotum van voor de video's van haar gebruikers. - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - deze instantie voorziet onbeperkte opslagruimte voor de video's van haar gebruikers. - - 31 - - - - - User registration is currently not allowed. - - Een account maken is momenteel niet toegelaten op deze instantie. - - 36 + 29 About PeerTube - Over PeerTube + +Over PeerTube + + 1 @@ -391,7 +1023,8 @@ It is a free and open-source software, under the AGPLv3 licence. - Het is vrije en open-source software, beschikbaar onder de AGPLv3. + +Het is vrije en open-source software, beschikbaar onder de AGPLv3 licentie. 8 @@ -400,7 +1033,8 @@ For more information, please visit joinpeertube.org. - Kijk voor meer informatie op joinpeertube.org. + +Kijk voor meer informatie op joinpeertube.org. 12 @@ -417,7 +1051,8 @@ PeerTube uses the BitTorrent protocol to share bandwidth between users. This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video. - PeerTube gebruikt het BitTorrent-protocol om bandbreedte tussen gebruikers te delen. Dat betekent ook dat jouw IP-adres bijgehouden wordt in de BitTorrent-tracker van de PeerTube-instantie zolang je de video aan het bekijken bent. + +PeerTube gebruikt het BitTorrent-protocol om bandbreedte tussen gebruikers te delen. Dat betekent ook dat jouw IP-adres bijgehouden wordt in de BitTorrent-tracker van de PeerTube-instantie zolang je de video aan het bekijken bent. 20 @@ -434,7 +1069,8 @@ In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video. In practice, this is much more difficult because: - In theorie kan iemand met technische kennis een script maken dat bijhoudt welk IP-adres welke video aan het downloaden is. In de praktijk is dat wat moeilijker: + +In theorie kan iemand met technische kennis een script maken dat bijhoudt welk IP-adres welke video aan het downloaden is. In de praktijk is dat wat moeilijker omdat: 27 @@ -444,7 +1080,8 @@ An HTTP request has to be sent on each tracker for each video to spy. If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot) - Voor elke video waarvan hij de kijkers wil bespioneren, moet hij een apart HTTP-request sturen. Om dat voor alle PeerTube-videos te doen, moeten er dus evenveel HTTP-requests als video's gebruikt worden (dat kan hoog oplopen). + +Voor elke video waarvan hij de kijkers wil bespioneren, moet hij een apart HTTP-request sturen. Om dat voor alle PeerTube-videos te doen, moeten er dus evenveel HTTP-requests als video's gebruikt worden (dat kan hoog oplopen). 33 @@ -454,7 +1091,8 @@ For each request sent, the tracker returns random peers at a limited number. For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm - Voor elk request geeft de tracker een beperkt aantal willekeurige peers terug. Als er bijvoorbeeld 1000 peers beschikbaar zijn en de tracker steeds 20 peers teruggeeft, moeten er op zijn minst 50 requests gestuurd worden om alle peers te weten te komen. + +Voor elk request geeft de tracker een beperkt aantal willekeurige peers terug. Als er bijvoorbeeld 1000 peers beschikbaar zijn en de tracker steeds 20 peers teruggeeft, moeten er op zijn minst 50 requests gestuurd worden om alle peers te weten te komen. 38 @@ -463,7 +1101,8 @@ Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour - Die requests moeten regelmatig herhaald worden om te kunnen achterhalen wie begint of stopt met een video te bekijken. Het is gemakkelijk om zulk gedrag te detecteren. + +Die requests moeten regelmatig herhaald worden om te kunnen achterhalen wie begint of stopt met een video te kijken. Het is gemakkelijk om zulk gedrag te detecteren. 43 @@ -472,7 +1111,8 @@ If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video - Als een IP-adres opgeslagen is in de tracker, betekent dat niet dat de persoon achter dat adres (als die persoon bestaat) de video bekeken heeft + +Als een IP-adres opgeslagen is in de tracker, betekent dat niet dat de persoon achter dat adres (als die persoon bestaat) de video bekeken heeft 47 @@ -481,57 +1121,202 @@ The IP address is a vague information : usually, it regularly changes and can represent many persons or entities - Een IP-adres is vage + +Een IP-adres is vage informatie: Meestal veranderd het regelmatig en kan het meerdere personen en identiteiten representeren 51 + + + Web peers are not publicly accessible: because we use WebRTC inside the web browser (with the WebTorrent library), the protocol is different from classic BitTorrent. + When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to. + See this document for more information + + +Web peers zijn niet openbaar bereikbaar: omdat we WebRTC in de webbrowser gebruiken (met de WebTorrent-bibliotheek), is het protocol anders dan in klassieke BitTorrent. + Wanneer je in een webbrowser zit, verstuur je een signaal die je IP adres bevat naar de tracker die willekeurig andere peers kiest om de informatie heen te sturen. + See dit document voor meer informatie + + 55 + + + + + The worst-case scenario of an average person spying on their friends is quite unlikely. + There are much more effective ways to get that kind of information. + + +Het worst-case scenario dat kan gebeuren van een gemiddeld persoon die hun vrienden bespioneert is erg onwaarschijnlijk. +Er zijn veel effectievere manieren om dat soort informatie te verkrijgen. + + 62 + + + + How does PeerTube compare with YouTube? + Hoe is PeerTube vergeleken met YouTube? + + 67 + + + + + The threats to privacy in YouTube are different from PeerTube's. + In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you. + Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). + + +De bedreigingen tegen privacy in YouTube zijn verschillend dan in PeerTube's geval. +In YouTube's geval, verzamelt het platform een gigantisch aantal persoonlijke informatie (niet alleen je IP) om te analyseren en om je te tracken. +Verder nog, YouTube is eigendom van Google/Alphabet, een bedrijf die je trackt over meerdere websites (via AdSense of Google Analytics). + + 69 + + + + What can I do to limit the exposure of my IP address? + Wat kan ik doen om de blootstelling van mijn IP adress te verminderen? + + 75 + + Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more. PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser. Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense. - Je IP-adres is geen privé-gegeven. Elke keer je een website bezoekt, is er een aantal entiteiten (bovenop de website die je effectief bezoekt) die je IP zien in hun logs: ISP's, routers, trackers, CDN's en meer. -PeerTube is transparant: we waarschuwen je dat je, als je je IP-adres privé wil afschermen, je een VPN of de Tor-Browser moet gebruiken. -Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit geven. + +Je IP-adres is openbaar dus elke keer dat je een website bezoekt, zijn er een aantal actoren (bovenop de website die je effectief bezoekt) die je IP zien in hun logs: ISP/routers/trackers/CDN en meer. +PeerTube is daarover transparant: we waarschuwen je dat je, als je je IP-adres wil afschermen, je een VPN of de Tor-Browser moet gebruiken. +Denken dat het P2P-mechanisme uit PeerTube halen je anonimiteit terug zou geven is onlogisch. 77 - - subscribers - abonnees + + What will be done to mitigate this problem? + Wat zal worden gedaan om dit probleem te verminderen? - 24 + 83 - - Video channels - Videokanalen + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + +PeerTube is in haar ontwikkelingsfasen, en wilt de beste tegenmaatregelen mogelijk geven tegen de tijd dat de stabiele versie is gereleased. +Ondertussen willen we verschillende ideeën testen die gerelateerd zijn aan dit probleem: - 31 + 85 - - Stats - Statistieken + + Set a limit to the number of peers sent by the tracker + Zet een limiet op het aantal peers verzonden door de tracker - 16 + 91 - - Joined - Account aangemaakt op + + Set a limit on the request frequency received by the tracker (being tested) + Zet een limiet op de verzoekfrequentie verkregen door de tracker (wordt getest) - 10 + 92 - - subscribers - abonnees + + Ring a bell if there are unusual requests (being tested) + Laat iets horen als er ongebruikelijke requests zijn (wordt getest) - 14 + 93 + + + + Disable P2P from the administration interface + Schakel P2P uit vanuit het administratieinterface + + 94 + + + + An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program + Een automatisch video-overbodigheidsprogramma: we zouden niet weten of het IP de video met opzet heeft gedownload, of als het een geautomatiseerd programma was. + + 95 + + + + Banned + Verbannen + + 12 + + + + Muted + Gedempt + + 13 + + + + Muted by your instance + Gedempt door jouw instantie + + 14 + + + + Instance muted + Instantie gedempt + + 15 + + + + Instance muted by your instance + Instantie gedempt door jouw instantie + + 16 + + + + subscribers + abonnees + + 24 + + + + Video channels + Videokanalen + + 31 + + + + Stats + Statistieken + + 16 + + + + Joined + Account aangemaakt op + + 10 + + + + subscribers + abonnees + + 14 @@ -552,42 +1337,49 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Short description Korte omschrijving - 22 + 21 Default client route Startpagina - 55 + 48 + + + + Videos Overview + Video-overzicht + + 51 Videos Trending Populaire video's - 59 + 52 Videos Recently Added Recent toegevoegde video's - 60 + 53 Local videos Video's op deze instantie - 61 + 54 Policy on videos containing sensitive content Beleid rond video's met gevoelige inhoud - 70 + 61 @@ -622,42 +1414,77 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Signup enabled Registratie mogelijk - 93 + 84 + + + + Signup requires email verification + E-mailverificatie nodig bij registratie + + 91 Signup limit Registratielimiet + + 96 + + + + Users + Gebruikers 105 - - Administrator - Beheerder + + User default video quota + Standaard video-quotum voor gebruikers - 131 + 109 - - Admin email - E-mail van beheerder + + User default daily upload limit + Standaard dagelijks video-quotum voor gebruikers - 134 + 121 - - Users - Gebruikers + + Import + Importeren - 144 + 42 - - User default video quota - Standaard video-quotum voor gebruikers + + Video import with HTTP URL (i.e. YouTube) enabled + Video-import met HTTP URL (d.w.z. YouTube) ingeschakeld - 147 + 141 + + + + Video import with a torrent file or a magnet URI enabled + Video-import met een torrentbestand of een magnet URL ingeschakeld + + 148 + + + + Administrator + Administrator + + 155 + + + + Admin email + E-mail van administrator + + 158 @@ -678,21 +1505,21 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Your Twitter username Je Twitter-gebruikersnaam - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Geeft het Twitter-account aan voor de website of het platform waarop de inhoud gepubliceerd werd. - 184 + 187 Instance whitelisted by Twitter - Instantie ge-whitelist door Twitter + Instantie gewhitelist door Twitter - 198 + 199 @@ -706,77 +1533,120 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Transcoding Transcoding - 210 + 215 Transcoding enabled Transcoding ingeschakeld - 215 + 221 If you disable transcoding, many videos from your users will not work! - Als je transcoding niet inschakelt, zullen veel video's die je gebruikers uploaden niet overal werken! + Als je transcoding niet inschakelt, zullen veel video's die je gebruikers uploaden niet werken! - 216 + 222 Transcoding threads Threads gebruikt voor transcoding - 223 + 237 + + + + Resolution enabled + Resolutie ingeschakeld + + 252 + + + + + Cache + + + + +Cache + + + + 260 + + + + Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. + Sommige bestanden zijn niet federaal (voorbeelden, ondertitelingen). We verkrijgen ze direct van hun afkomstige instantie en cachen ze. + + 265 Previews cache size Cachegrootte voor previews - 254 + 271 + + + + Video captions cache size + Cachegrootte van video-ondertiteling + + 280 Customizations Aanpassingen - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> - Schrijf JavaScriptcode.<br />Voorbeeld: <pre>console.log('mijn instantie is fantastisch');</pre> + Schrijf direct JavaScriptcode.<br />Bijvoorbeeld: <pre>console.log('mijn instantie is fantastisch');</pre> - 281 + 297 Advanced configuration Geavanceerde configuratie - 207 + 212 Update configuration - Updateconfiguratie + Bijwerkingsconfiguratie + + 340 + + + + It seems the configuration is invalid. Please search potential errors in the different tabs. + Het lijkt erop dat de configuratie invalide is. Zoek alstublieft potentiële foutmeldingen op in andere tabbladen. - 325 + 341 Users - Gebruikers + +Gebruikers 3 @@ -785,16 +1655,28 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Manage follows - Volgers beheren + +Volgers beheren 7 + + + Moderation + + +Moderatie + + 11 + + Jobs - Jobs + +Banen 15 @@ -803,7 +1685,8 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Configuration - Configuratie + +Configuratie 19 @@ -819,18 +1702,26 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers. - Het ziet ernaar uit dat je op een server bent zonder HTTPS. Op je webserver moet TLS geactiveerd zijn om servers te kunnen volgen. + +Het ziet ernaar uit dat je op een server bent zonder HTTPS. Op je webserver moet TLS geactiveerd zijn om servers te kunnen volgen. 17 Add following - Abonneren + Voeg volgend toe 21 + + Filter... + Filtreren... + + 27 + + ID ID @@ -866,6 +1757,27 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 11 + + Accepted + Geaccepteerd + + 32 + + + + Pending + In behandeling + + 33 + + + + Redundancy allowed + Overtolligheid toegelaten + + 22 + + Manage follows Abonnementen beheren @@ -873,9 +1785,30 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 2 + + Following + Volgend + + 5 + + + + Follow + Volg + + 7 + + + + Followers + Volgers + + 9 + + Jobs list - Lijst van jobs + Banenlijst 2 @@ -887,6 +1820,20 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 19 + + Processed on + Behandeld op + + 22 + + + + Finished on + Voltooid op + + 23 + + Create user Gebruiker aanmaken @@ -910,7 +1857,7 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge mail@example.com - mail@example.org + mail@voorbeeld.org 21 @@ -935,6 +1882,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 65 + + Daily video quota + Dagelijks videoquotum + + 72 + + Users list Gebruikerslijst @@ -942,6 +1896,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 2 + + Batch actions + Batchacties + + 19 + + Username Gebruikersnaam @@ -949,6 +1910,65 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 40 + + (banned) + (verbannen) + + 65 + + + + Go to the account page + Ga naar accountpagina + + 133 + + + + User's email must be verified to login + Gebruiker's e-mail moet geverifieerd zijn om in te loggen + + 72 + + + + User's email is verified / User can login without email verification + Gebruiker's e-mail is geverifieerd / Gebruiker kan inloggen zonder e-mailverificatie + + 76 + + + + Ban reason: + Reden van verbanning: + + 95 + + + + Moderation comment + Beheerdersopmerking + + 3 + + + + + This comment can only be seen by you or the other moderators. + + +Deze opmerking kan alleen door jou en andere beheerders gezien worden. + + 17 + + + + Update this comment + Werk deze comment bij + + 25 + + Reporter Melder @@ -963,6 +1983,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 14 + + State + Status + + 11 + + Go to the account Naar account gaan @@ -977,60 +2004,183 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 33 - - Blacklisted videos - Video's op zwarte lijst + + Actions + Acties - 7 + 35 - - My settings - Mijn instellingen + + Reason: + Reden: - 3 + 53 - - My videos - Mijn video's + + Moderation comment: + Beheerderopmerking: - 14 + 57 - - Video quota: - Videoquotum: + + Video name + Videonaam - 4 + 8 - - Profile - Profiel + + Sensitive + Gevoelig - 8 + 9 - - Video settings - Video-instellingen + + Date + Datum - 15 + 11 + + + + Blacklist reason: + Reden voor de zwarte lijst: + + 43 + + + + Moderation + Beheer + + 2 + + + + Video abuses + Videomisbruik + + 5 + + + + Blacklisted videos + Video's op zwarte lijst + + 7 + + + + Muted accounts + Gedempte accounts + + 2 + + + + Muted servers + Gedempte servers + + 11 + + + + Account + Account + + 12 + + + + Muted at + Gedempt bij + + 13 + + + + Unmute + Demping opheffen + + 23 + + + + Video quota: + Videoquotum: + + 4 + + + + Profile + Profiel + + 7 + + + + Video settings + Video-instellingen + + 16 + + + + Danger zone + Gevarenzone + + 19 + + + + Change ownership + Verander eigenaar + + 46 + + + + Select the next owner + Selecteer de volgende eigenaar + + 9 + + + + + Cancel + + +Annuleren + + 35 - views - Video’s - aantal keer bekeken + - weergaven 19 + + Blacklisted + Op de zwarte lijst + + 22 + + Cancel - Annuleren + +Annuleren 30 @@ -1056,6 +2206,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 6 + + Example: my_channel + Bijvoorbeeld: mijn_kanaal + + 15 + + Display name Weergavenaam @@ -1066,12 +2223,26 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Short text to tell people how they can support your channel (membership platform...).<br /><br /> When you will upload a video in this channel, the video support field will be automatically filled by this text. - Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschap…).<br/><br/> -Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "ondersteun"-veld. + Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschapsplatform…).<br /><br /> +Als je een video uploadt op dit kanaal, wordt deze tekst ingevuld in het "ondersteun"-veld. 52 + + Target + Doelwit + + 8 + + + + You don't have any subscriptions yet. + Je hebt nog geen abonnementen. + + 1 + + Created by Gemaakt door @@ -1086,6 +2257,75 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 16 + + Accept ownership + Accepteer eigenaar + + 3 + + + + Select the target channel + Selecteer het doelwitkanaal + + 9 + + + + Initiator + Initiatiefnemer + + 13 + + + + + Created + + + + Gecreëerd op + + + + 15 + + + + Status + Status + + 19 + + + + Action + Actie + + 20 + + + + + + + 39 + + + + Refuse + Weigeren + + 47 + + + + Muted instances + Gedempte instanties + + 2 + + Change password Wachtwoord veranderen @@ -1093,6 +2333,13 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 30 + + Current password + Huidige wachtwoord + + 7 + + New password Nieuw wachtwoord @@ -1114,8 +2361,17 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 3 + + Use WebTorrent to exchange parts of the video with others + Gebruik WebTorrent om delen van de video over te maken naar anderen + + 21 + + - Automatically plays videoAutomatically plays video + Automatically plays video + Video automatisch afspelen + 28 @@ -1128,11 +2384,25 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Update my profile - Update mijn profiel + Werk mijn profiel bij 27 + + subscribers + abonnees + + 10 + + + + Change the avatar + Verander de avatar + + 15 + + (extensions: , max size: ) (extensies: , maximale grootte: ) @@ -1140,15 +2410,84 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 18 + + Once you delete your account, there is no going back. Please be certain. + Als je je account verwijdert, kan je niet meer terug. +Wees alstublieft zeker. + + 2 + + + + Delete your account + Verwijder jouw account + + 4 + + Sorry, but we couldn't find the page you were looking for. - Sorry, maar die pagina kon niet gevonden worden. + +Sorry, maar die pagina kon niet gevonden worden. + 1 + + + Verify account email confirmation + + +Verifieer e-mailbevestiging van account + + 2 + + + + + Your email has been verified and you may now login. Redirecting... + + +Jouw e-mail is geverifieerd en je mag nu inloggen. +Je wordt doorverwezen... + + 6 + + + + An error occurred. + Er is een probleem opgetreden. + + 11 + + + + + Request email for account verification + + +Vraag e-mail voor accountverificatie aan + + 2 + + + + Send verification email + Verzend e-mail voor verificatie + + 17 + + + + This instance does not require email verification. + Deze instantie heeft geen verificatie door e-mail nodig. + + 20 + + Support this channel Ondersteun dit kanaal @@ -1163,6 +2502,20 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 17 + + URL + URL + + 17 + + + + You can import any URL <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>supported by youtube-dl</a> or URL that points to a raw MP4 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. + Je kan elke URL importeren <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>ondersteunt door youtube-dl</a> of elke URL die naar een rauw MP4 bestand wijst. Je moet zeker weten dat je de diffusierechten hebt over de inhoud waar het naar wijst, anders kan het wettelijke problemen aan jou of je instantie geven. + + 9 + + Channel Kanaal @@ -1172,11 +2525,37 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Privacy - Zichtbaarheid + Privacy 159 + + Sorry, but something went wrong + Sorry, er is iets fout gegaan + + 49 + + + + + Congratulations, the video behind will be imported! You can already add information about this video. + + +Gefeliciteerd, de video achter zal worden geimporteerd! Je kan nu al informatie over deze video toevoegen. + + + + 46 + + + + Update + Bijwerken + + 92 + + Select the file to upload Selecteer het bestand om te uploaden @@ -1184,74 +2563,216 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 6 + + Scheduled + Ingeroosterd + + 25 + + Publish will be available when upload is finished Publiceren is mogelijk wanneer de upload voltooid is - 53 + 58 Publish Publiceren - 60 + 65 - - Title - Titel + + Select the torrent to import + Selecteer de torrent om te importeren - 9 + 6 - - Tags - Tags + + Or + Of - 191 + 11 - - Video descriptions are truncated by default and require manual action to expand them. - Videobeschrijvingen worden standaard gedeeltelijk weergegeven, de kijker kan ze handmatig openvouwen. + + Paste magnet URI + Plak magnet URL - 28 + 14 - - Schedule publication () - Publicatie uitstellen () + + You can import any torrent file that points to a mp4 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. + Je kan elk torrentbestand importeren die wijst naar een mp4 bestand. Je moet zeker weten dat je de diffusierechten over de inhoud waar het naar wijst hebt, anders kan het wettelijke problemen aan jezelf en je instantie geven. - 105 + 17 - - This video contains mature or explicit content - Deze video bevat expliciete inhoud of inhoud die enkel voor volwassenen geschikt is + + + Congratulations, the video will be imported with BitTorrent! You can already add information about this video. + + +Gefeliciteerd, de video zal geimporteerd worden met BitTorrent! +Je kan nu al informatie toevoegen over deze video. + + - 119 + 53 - - Some instances do not list videos containing mature or explicit content by default. - Op sommige instanties worden expliciete video's standaard niet in zoekresultaten en in lijsten getoond. + + Import + Importeer - 120 + 3 - - Enable video comments - Videoreacties toelaten + + Upload + Uploaden - 125 + 4 + + + + Upload a file + Upload een bestand + + 10 + + + + Import with URL + Importeer met URL + + 17 + + + + Import with torrent + Importeer met torrent + + 24 + + + + Add caption + Voeg ondertiteling toe + + 5 + + + + Select the caption file + Selecteer het ondertitelingsbestand + + 24 + + + + + This will replace an existing caption! + + +Dit zal een bestaande ondertiteling vervangen! + + 29 + + + + Add this caption + Voeg deze ondertiteling toe + + 40 + + + + Title + Titel + + 9 + + + + Tags + Tags + + 191 + + + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Tags kunnen gebruikt worden om relevante aanraders te suggesteren. </br>Druk op Enter om een nieuwe tag toe te voegen. + + 18 + + + + + Tag + Tag + + 21 + + + + Enter a new tag + Vul een nieuwe tag in + + 21 + + + + Video descriptions are truncated by default and require manual action to expand them. + Videobeschrijvingen worden standaard gedeeltelijk weergegeven en moeten handmatig opengevouwen worden. + + 28 + + + + Schedule publication () + Publicatie inroosteren op () + + 105 + + + + This video contains mature or explicit content + Deze video bevat expliciete inhoud of inhoud die enkel voor volwassenen geschikt is + + 119 + + + + Some instances do not list videos containing mature or explicit content by default. + Op sommige instanties worden expliciete video's standaard niet in zoekresultaten en in lijsten getoond. + + 120 + + + + Enable video comments + Videoreacties inschakelen + + 125 Wait transcoding before publishing the video Wacht tot het transcoderen voltooid is om de video te publiceren - 130 + 131 + + + + If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. + Als je beslist om niet te wachten totdat de transcoding compleet is voordat je de video publiceert, kan de video onspeelbaar zijn totdat de transcoding eindigt. + + 132 @@ -1261,18 +2782,84 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 4 + + Add another caption + Voeg nog een ondertiteling toe + + 147 + + + + See the subtitle file + Zie het ondertitelingsbestand + + 156 + + + + Already uploaded ✔ + Al geupload ✔ + + 160 + + + + Will be created on update + Wordt gecreëerd bij bijwerking + + 168 + + + + Cancel create + Annuleer creatie + + 170 + + + + Will be deleted on update + Wordt verwijdert bij bijwerking + + 176 + + + + Cancel deletion + Annuleer verwijdering + + 178 + + + + + No captions for now. + + +Geen ondertiteling voor nu. + + 183 + + + + Captions + Ondertiteling + + 140 + + Upload thumbnail Thumbnail uploaden - 195 + 196 Upload preview Voorvertoning uploaden - 202 + 203 @@ -1284,26 +2871,238 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Short text to tell people how they can support you (membership platform...). - Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (bv. door gelddonaties). + Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschapsplatforms...). - 209 + 210 Advanced settings Geavanceerde instellingen - 190 + 191 Update + + updaten 2 + + Download video + Download video + + 3 + + + + Direct download + Directe download + + 27 + + + + Torrent (.torrent file) + Torrent (.torrent bestand) + + 32 + + + + Torrent (magnet link) + Torrent (magnet link) + + 37 + + + + + Cancel + + +Annuleren + + 47 + + + + Download + Downloaden + + 84 + + + + Report video + Rapporteer video + + 3 + + + + Share + Deel + + 74 + + + + QR-Code + QR-Code + + 29 + + + + Embed + Inbedden + + 34 + + + + + The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). + + +Deze url is niet beveiligd (geen HTTPS), dus de ingebedde video werkt niet op HTTPS websites (web browsers blokkeren onbeveiligde HTTP verzoeken op HTTPS websites). + + 45 + + + + Close + Sluiten + + 51 + + + + Blacklist video + Video op de zwarte lijst zetten + + 3 + + + + + The video is being imported, it will be available when the import is finished. + + +De video wordt geimporteerd, hij zal beschikbaar worden wanneer de import klaar is. + + 11 + + + + + The video is being transcoded, it may not work properly. + + +De video wordt getranscode, hij kan misschien niet naar behoren werken. + + 15 + + + + + This video will be published on . + + +Deze video wordt gepubliceerd op . + + 19 + + + + This video is blacklisted. + Deze video staat op de zwarte lijst. + + 24 + + + + + Published - views + + +Gepubliceerde - weergaven + + 37 + + + + + Published - views + + +Gepubliceerde - weergaven + + 46 + + + + Like this video + Like deze video + + 57 + + + + Dislike this video + Dislike deze video + + 64 + + + + Download the video + Download de video + + 83 + + + + Report + Rapporteer + + 88 + + + + Report this video + Rapporteer deze video + + 87 + + + + Update this video + Werk deze video bij + + 91 + + + + Blacklist + Zet op de zwarte lijst + + 96 + + + + Blacklist this video + Zet deze video op de zwarte lijst + + 95 + + Unblacklist Van zwarte lijst halen @@ -1311,30 +3110,2464 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 100 - - Publication scheduled on - Publicatie uitgesteld tot + + Unblacklist this video + Haal deze video van de zwarte lijst - 1 + 99 - - Display name is required. - Een weergavenaam is verplicht + + Delete this video + Verwijder deze video + + 103 + + + + Go the channel page + Ga naar kanaalpagina + + 123 + + + + By + Door + + 134 + + + + Show more + Laat meer zien + + 146 + + + + Show less + Laat minder zien + + 152 + + + + Friendly Reminder: + Vriendelijke Herinnering: + + 208 + + + + + the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. + + + Uit het deelsysteem gebruikt voor deze video blijkt het dat sommige technische informatie over jouw systeem (zoals een openbaar IP adres) verstuurd kan worden naar andere peers. + + + 209 + + + + More information + Meer informatie + + 212 + + + + Get more information + Krijg meer informatie + + 212 + + + + + OK + + + OK + + + 215 + + + + + Other videos + + + Andere videos + + + 2 + + + + + Comments + + + Reacties + + + 3 + + + + No comments. + Geen reacties + + 17 + + + + View all replies + Laat alle antwoorden zien + + 54 + + + + + Comments are disabled. + + + Reacties zijn uitgeschakeld. + + + 63 + + + + Add comment... + Voeg reactie toe... + + 6 + + + + + Post comment + + + Post reactie. + + + 20 + + + + You are one step away from commenting + Je bent een stap verwijderd van reageren + + 28 + + + + + If you have an account on this instance, you can login: + + + Als je een account hebt op deze instantie, kan je inloggen: + + + 32 + + + + login to comment + log in om te reageren + + 35 + + + + + Otherwise you can comment using an account on any ActivityPub-compatible instance. + On most platforms, you can find the video by typing its URL in the search bar and then comment it + from within the software's interface. + + + Anders kan je reageren door een account te gebruiken op welke ActivityPub-compatibele instatie dan ook. + Op de meeste platforms kan je de video vinden door zijn URL in de zoekbalk te typen en vervolgens het vanuit binnenin de software's interface te reageren. + + 36 + + + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + +Als je een account op Mastodon of Pleroma hebt, kan je het direct openen vanuit hun interface: + + 41 + + + + Highlighted comment + Belichte reactie + + 5 + + + + Reply + Antwoord + + 14 + + + + No description + Geen beschrijving + + 1 + + + + Published videos + Gepubliceerde videos + + 1 + + + + Published videos + Videos gepubliceerd + + 1 + + + + 240p + 240p + + 1 + + + + 360p + 360p + + 1 + + + + 480p + 480p + + 1 + + + + 720p + 720p + + 1 + + + + 1080p + 1080p + + 1 + + + + Auto (via ffmpeg) + Auto (via ffmpeg) + + 1 + + + + Configuration updated. + Configuratie bijgewerkt. + + 1 + + + + Unlimited + Oneindig + + 1 + + + + 100MB + 100MB + + 1 + + + + 500MB + 500MB + + 1 + + + + 1GB + 1GB + + 1 + + + + 5GB + 5GB + + 1 + + + + 20GB + 20GB + + 1 + + + + 50GB + 50GB + + 1 + + + + 10MB + 10MB + + 1 + + + + 50MB + 50MB + + 1 + + + + 2GB + 2GB + + 1 + + + + is not valid + is niet valide + + 1 + + + + You need to specify hosts to follow. + Je moet de hosts specificeren om te volgen. + + 1 + + + + Hosts need to be unique. + Hosts moeten uniek zijn. + + 1 + + + + If you confirm, you will send a follow request to: - + Als je bevestigd, verzend je een volgverzoek naar: - + + 1 + + + + Follow new server(s) + Volg nieuwe server(s) + + 1 + + + + Follow request(s) sent! + Volgverzoek(en) verstuurd! + + 1 + + + + Do you really want to unfollow ? + Wil je echt onvolgen? + + 1 + + + + Unfollow + Onvolgen + + 1 + + + + You are not following anymore. + Je volgt niet meer. + + 1 + + + + enabled + ingeschakeld + + 1 + + + + disabled + uitgeschakeld + + 1 + + + + Redundancy for is + Overtolligheid voor is + + 1 + + + + Account unmuted by your instance. + Account niet meer gedempt door jouw instantie. + + 1 + + + + Instance unmuted by your instance. + Instantie niet meer gedempt door jouw instantie. + + 1 + + + + Comment updated. + Reactie bijgewerkt. + + 1 + + + + Delete this report + Verwijder deze rapportage + + 1 + + + + Update moderation comment + Werk beheerder-reactie bij + + 1 + + + + Mark as accepted + Markeer als geaccepteerd + + 1 + + + + Mark as rejected + Markeer als afgewezen + + 1 + + + + Do you really want to delete this abuse report? + Wil je echt dit misbruiksrapportage verwijderen? + + 1 + + + + Abuse deleted. + Misbruik verwijdert. + + 1 + + + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. + Wil je deze video echt verwijderen van je zwarte lijst? Hij zal weer beschikbaar zijn in de videolijst. + + 1 + + + + Video removed from the blacklist. + Video verwijdert van de zwarte lijst. + + 1 + + + + User created. + Gebruiker verwijdert. + + 1 + + + + User updated. + Gebruiker bijgewerkt. + + 1 + + + + Update user + Werk gebruiker bij + + 1 + + + + Unban + Onverban + + 1 + + + + Set Email as Verified + Zet E-mail als Geverifieerd + + 1 + + + + You cannot ban root. + Je kan root niet verbannen. + + 1 + + + + Do you really want to unban users? + Wil jij echt gebruikers onverbannen? + + 1 + + + + users unbanned. + gebruikers onverbannen. + + 1 + + + + You cannot delete root. + Je kan root niet verwijderen. + + 1 + + + + If you remove these users, you will not be able to create others with the same username! + Als jij deze gebruikers verwijdert, kan je niet meer anderen maken met dezelfde gebruikersnaam! + + 1 + + + + users deleted. + gebruikers verwijdert. + + 1 + + + + users email set as verified. + gebruikers'' gezet als geverifieerd. + + 1 + + + + Account unmuted. + Account niet meer gedempt. + + 1 + + + + Instance unmuted. + Instantie niet meer gedempt. + + 1 + + + + Ownership accepted + Eigendom geaccepteerd + + 1 + + + + Password updated. + Wachtwoord bijgewerkt. + + 1 + + + + You current password is invalid. + Jouw huide wachtwoord is invalide. + + 1 + + + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. + Weet je zeker dat je jouw account wil verwijderen? Dit verwijdert al jouw data, inclusief kanalen, videos etc. + + 1 + + + + Type your username to confirm + Typ je gebruikersnaam in om te bevestigen + + 1 + + + + Delete my account + Verwijder mijn account + + 1 + + + + Your account is deleted. + Jouw account is verwijdert. + + 1 + + + + Profile updated. + Profiel bijgewerkt. + + 1 + + + + Avatar changed. + Avatar verandert. + + 1 + + + + Information updated. + Informatie bijgewerkt. + + 1 + + + + Video channel created. + Videokanaal gecreëerd. + + 1 + + + + This name already exists on this instance. + Deze naam bestaat al op deze instantie. + + 1 + + + + Create + Creeër + + 1 + + + + Video channel updated. + Videokanaal bijgewerkt. + + 1 + + + + Video channel deleted. + Videokanaal verwijdert. + + 1 + + + + My videos + Mijn video's + + 1 + + + + Do you really want to delete videos? + Wil jij echt videos verwijderen? + + 1 + + + + videos deleted. + videos verwijdert. + + 1 + + + + Do you really want to delete ? + Weet jij zeker dat je wilt verwijderen? + + 1 + + + + Video deleted. + Video verwijdert. + + 1 + + + + Published + Gepubliceerd + + 1 + + + + Publication scheduled on + Publicatie uitgesteld tot + + 1 + + + + Waiting transcoding + Wachten op transcoding + + 1 + + + + To transcode + Om te transcoden + + 1 + + + + To import + Om te importeren + + 1 + + + + Ownership change request sent. + Eigenaarsveranderingsaanvrag gestuurd. + + 1 + + + + My library + Mijn bibliotheek + + 1 + + + + My channels + Mijn kanalen + + 1 + + + + My subscriptions + Mijn abonnementen + + 1 + + + + Misc + Varia + + 1 + + + + Ownership changes + Veranderingen van eigenaar + + 1 + + + + My settings + Mijn instellingen + + 1 + + + + An email with verification link will be sent to . + Een e-mail met verificatielink wordt verstuurd naar . + + 1 + + + + Unable to find user id or verification string. + Niet in staat om gebruikersid of verificatiestring te vinden. + + 1 + + + + Subscribe to the account + Abonneer op het account + + 1 + + + + Focus the search bar + Focus de zoekbalk + + 1 + + + + Toggle the left menu + Schakel het linker menu aan of uit + + 1 + + + + Go to the videos overview page + Ga naar de video-overzichtspagina + + 1 + + + + Go to the trending videos page + Ga naar de trending videos pagina + + 1 + + + + Go to the recently added videos page + Ga naar recent toegevoegde videos pagina + + 1 + + + + Go to the local videos page + Ga naar de locale videos pagina + + 1 + + + + Go to the videos upload page + Ga naar de videos uploadpagina + + 1 + + + + Toggle Dark theme + Schakel donker thema aan of uit + + 1 + + + + Go to my subscriptions + Ga naar mijn abonnementen + + 1 + + + + Go to my videos + Ga naar mijn videos + + 1 + + + + Go to my imports + Ga naar mijn imports + + 1 + + + + Go to my channels + Ga naar mijn kanalen + + 1 + + + + Cannot retrieve OAuth Client credentials: . + + Kan niet credenties van OAuth Client verkrijgen: . + + + 1 + + + + Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section. + Weet zeker dat je correct PeerTube geconfigureerd hebt (config/directory), vooral de "webserver" sectie. + + 1 + + + + Error + Fout + + 1 + + + + You need to reconnect. + Je moet opnieuw verbinden. + + 1 + + + + Confirm + Bevestigen + + 1 + + + + Keyboard Shortcuts: + Keyboard Shortcuts: + + 1 + + + + Info + Info + + 1 + + + + Success + Success + + 1 + + + + Incorrect username or password. + Incorrecte gebruikersnaam of wachtwoord. + + 1 + + + + You account is blocked. + Jouw account is geblokkeerd. + + 1 + + + + An email with the reset password instructions will be sent to . + Een e-mail met de wachtwoord reset instructies wordt gestuurd naar . + + 1 + + + + Your password has been successfully reset! + Jouw wachtwoord is succesvol gereset! + + 1 + + + + Today + Vandaag + + 1 + + + + Last 7 days + Laatste 7 dagen + + 1 + + + + Last 30 days + Laatste 30 dagen + + 1 + + + + Last 365 days + Laatste 365 dagen + + 1 + + + + Short (< 4 min) + Kort (< 4 min) + + 1 + + + + Long (> 10 min) + Long (> 10 min) + + 1 + + + + Medium (4-10 min) + Middelmatig (4-10 min) + + 1 + + + + Relevance + Relevantie + + 1 + + + + Publish date + Publicatiedatum + + 1 + + + + Views + Weergaven + + 1 + + + + Search + Zoeken + + 1 + + + + Instance name is required. + Instantienaam is vereist. + + 1 + + + + Short description should not be longer than 250 characters. + Korte beschrijvingen moeten niet langer zijn dan 250 karakters. + + 1 + + + + Twitter username is required. + Twitter gebruikersnaam is vereist. + + 1 + + + + Previews cache size is required. + Cachegrootte van voorvertoning is vereist. + + 1 + + + + Previews cache size must be greater than 1. + Cachegrootte van voorvertoning moet groter zijn dan 1. + + 1 + + + + Previews cache size must be a number. + Cachegrootte van voorvertoning moet een nummer zijn. + + 1 + + + + Captions cache size is required. + Cachegrootte van ondertiteling is vereist. + + 1 + + + + Captions cache size must be greater than 1. + Cachegrootte van ondertiteling moet groter zijn dan 1. + + 1 + + + + Captions cache size must be a number. + Cachegrootte van ondertiteling moet een nummer zijn. + + 1 + + + + Signup limit is required. + Inschrijflimiet is vereist. + + 1 + + + + Signup limit must be greater than 1. + Inschrijflimiet moet groter zijn dan 1. + + 1 + + + + Signup limit must be a number. + Inschrijflimiet moet een nummer zijn. + + 1 + + + + Admin email is required. + Administrator e-mail is vereist. + + 1 + + + + Admin email must be valid. + Administrator e-mail moet valide zijn. + + 1 + + + + Transcoding threads is required. + Transcoding threads zijn vereist. + + 1 + + + + Transcoding threads must be greater or equal to 0. + Transcoding threads moeten groter of gelijk zijn aan 0. + + 1 + + + + Email is required. + E-mail is vereist. + + 1 + + + + Email must be valid. + E-mail moet valide zijn. + + 1 + + + + Username is required. + Gebruikersnaam is vereist. + + 1 + + + + Password is required. + Wachtwoord is vereist. + + 1 + + + + Confirmation of the password is required. + Bevestiging van het wachtwoord is vereist. + + 1 + + + + Password must be at least 6 characters long. + Wachtwoord moet minstens 6 karakters lang zijn. + + 1 + + + + Password cannot be more than 255 characters long. + Wachtwoord kan niet langer zijn dan 255 karakters. + + 1 + + + + The new password and the confirmed password do not correspond. + Het nieuwe wachtwoord en het bevestigde wachtwoord zijn niet hetzelfde. + + 1 + + + + Video quota is required. + Videoquotum is vereist. + + 1 + + + + Quota must be greater than -1. + Quota moet groter zijn dan -1 + + 1 + + + + Daily upload limit is required. + Dagelijks uploadlimiet is vereist. + + 1 + + + + Daily upload limit must be greater than -1. + Dagelijks uploadlimiet moet groter zijn dan -1. + + 1 + + + + User role is required. + Gebruikersrol is vereist. + + 1 + + + + Display name is required. + Een weergavenaam is verplicht. + + 1 + + + + Description must be at least 3 characters long. + Beschrijvingen moeten minstens 3 karakters lang zijn. + + 1 + + + + Description cannot be more than 1000 characters long. + Beschrijvingen mogen niet langer dan 1000 karakters zijn. + + 1 + + + + You must to agree with the instance terms in order to registering on it. + Je moet akkoord gaan met de instantie's termijnen om erop te registreren. + + 1 + + + + Ban reason must be at least 3 characters long. + Verbanningsreden moet minstens 3 karakters zijn. + + 1 + + + + Ban reason cannot be more than 250 characters long. + Verbanningsreden kan niet langer dan 250 tekens zijn. + + 1 + + + + Report reason is required. + Rapportagereden is vereist. + + 1 + + + + Report reason must be at least 2 characters long. + Rapportagereden moet minstens 2 tekens zijn. + + 1 + + + + Moderation comment is required. + Beheersreactie is vereist. + + 1 + + + + Moderation comment must be at least 2 characters long. + Beheersreactie moet minstens 2 karakters zijn. + + 1 + + + + The channel is required. + Het kanaal is vereist. + + 1 + + + + Blacklist reason must be at least 2 characters long. + Zwartelijstreden moet minstens 2 karakters zijn. + + 1 + + + + Blacklist reason cannot be more than 300 characters long. + Zwartelijstreden kan niet langer dan 300 karakters zijn. + + 1 + + + + Video caption language is required. + Video ondertitelingstaal is vereist. + + 1 + + + + Video caption file is required. + Video ondertitelingsbestand is vereist. + + 1 + + + + The username is required. + De gebruikersnaam is vereist. + + 1 + + + + You can only transfer ownership to a local account + Je kan alleen je eigendom transporteren naar een lokaal account + + 1 + + + + Name is required. + Naam is vereist. + + 1 + + + + Support text must be at least 3 characters long. + Supporttekst moet minstens 3 karakters zijn. + + 1 + + + + Support text cannot be more than 1000 characters long. + Supporttekst mag niet meer zijn dan 1000 karakters. + + 1 + + + + Comment is required. + Reactie is vereist. + + 1 + + + + Comment must be at least 2 characters long. + Reactie moet minstens 2 karakters zijn. + + 1 + + + + Comment cannot be more than 3000 characters long. + Reactie kan niet meer dan 3000 karakters zijn. + + 1 + + + + Video name is required. + Videonaam is vereist. + + 1 + + + + Video name must be at least 3 characters long. + Videonaam moet minstens 3 karakters zijn. + + 1 + + + + Video name cannot be more than 120 characters long. + Videonaam kan niet meer dan 120 karakters zijn. + + 1 + + + + Video privacy is required. + Videoprivacy is vereist. + + 1 + + + + Video channel is required. + Videokanaal is vereist. + + 1 + + + + Video description must be at least 3 characters long. + Videobeschrijving moet minstens 3 karakters zijn. + + 1 + + + + Video description cannot be more than 10000 characters long. + Videobeschrijving kan niet meer dan 10000 karakters zijn. + + 1 + + + + A tag should be more than 2 characters long. + Een tag moet minstens 2 karakters zijn. + + 1 + + + + A tag should be less than 30 characters long. + Een tag moet minder dan 30 karakters zijn. + + 1 + + + + Video support must be at least 3 characters long. + Videosupport moet minstens 3 karakters zijn. + + 1 + + + + Video support cannot be more than 1000 characters long. + Videosupport kan niet meer dan 1000 karakters zijn. + + 1 + + + + A date is required to schedule video update. + Een datum is vereist om videoupdates in te roosteren. + + 1 + + + + This file is too large. + Dit bestand is te groot. + + 1 + + + + All unsaved data will be lost, are you sure you want to leave this page? + Alle onopgeslagen data zal verloren worden, weet je zeker dat je deze pagina wil verlaten? + + 1 + + + + Warning + Waarschuwing + + 1 + + + + Sunday + Zondag + + 1 + + + + Monday + Maandag + + 1 + + + + Tuesday + Dinsdag + + 1 + + + + Wednesday + Woensdag + + 1 + + + + Thursday + Donderdag + + 1 + + + + Friday + Vrijdag + + 1 + + + + Saturday + Zaterdag + + 1 + + + + Sun + Zon + + 1 + + + + Mon + Maa + + 1 + + + + Tue + Din + + 1 + + + + Wed + Woe + + 1 + + + + Thu + Don + + 1 + + + + Fri + Vri + + 1 + + + + Sat + Zat + + 1 + + + + Su + Zon + + 1 + + + + Mo + Ma + + 1 + + + + Tu + Di + + 1 + + + + We + Wo + + 1 + + + + Th + Do + + 1 + + + + Fr + Vr + + 1 + + + + Sa + Za + + 1 + + + + January + Januari + + 1 + + + + February + Februari + + 1 + + + + March + Maart + + 1 + + + + April + April + + 1 + + + + May + Mei + + 1 + + + + June + Juni + + 1 + + + + July + July + + 1 + + + + August + Augustus + + 1 + + + + September + September + + 1 + + + + October + Oktober + + 1 + + + + November + November + + 1 + + + + December + December + + 1 + + + + Jan + Jan + + 1 + + + + Feb + Feb + + 1 + + + + Mar + Mar + + 1 + + + + Apr + Apr + + 1 + + + + Jun + Jun + + 1 + + + + Jul + Jul + + 1 + + + + Aug + Aug + + 1 + + + + Sep + Sep + + 1 + + + + Oct + Oct + + 1 + + + + Nov + Nov + + 1 + + + + Dec + Dec + + 1 + + + + Clear + Wissen + + 1 + + + + yy-mm-dd + jj-mm-dd + + 1 + + + + Transcode your videos in multiple resolutions + Transcodeer je videos in meerdere resoluties + + 1 + + + + HTTP import (YouTube, Vimeo, direct URL...) + HTTP import(Youtube, Vimeo, directe URL...) + + 1 + + + + Torrent import + Torrentimport + + 1 + + + + ~ + ~ + + 1 + + + + {VAR_PLURAL, plural, =1 {minute} other {minutes} } + {VAR_PLURAL, plural, =1 {minute} other {minutes} } + + 1 + + + + of full HD videos + aan full HD videos + + 1 + + + + of HD videos + aan HD videos + + 1 + + + + of average quality videos + aan gemiddelde kwaliteit videos + + 1 + + + + years ago + jaar geleden + + 1 + + + + months ago + maanden geleden + + 1 + + + + month ago + maand geleden + + 1 + + + + weeks ago + weken geleden + + 1 + + + + week ago + week geleden + + 1 + + + + days ago + dagen geleden + + 1 + + + + day ago + dag geleden + + 1 + + + + hours ago + uren geleden + + 1 + + + + hour ago + uur geleden + + 1 + + + + min ago + min geleden + + 1 + + + + sec ago + sec geleden + + 1 + + + + Markdown compatible that supports: + Markeer compatibele dat support: + + 1 + + + + Emphasis + Nadruk + + 1 + + + + Links + Links + + 1 + + + + New lines + Nieuwe lijnen + + 1 + + + + Lists + Lijsten + + 1 + + + + Images + Afbeeldingen + + 1 + + + + users banned. + gebruikers verbannen. + + 1 + + + + User banned. + Gebruiker verbannen. + + 1 + + + + Do you really want to unban ? + Weet je zeker dat je wilt onverbannen? + + 1 + + + + User unbanned. + Gebruiker onverbannen. + + 1 + + + + If you remove this user, you will not be able to create another with the same username! + Als je deze gebruiker verwijdert, is het niet meer mogelijk om een andere te maken met dezelfde gebruikersnaam! + + 1 + + + + User deleted. + Gebruiker verwijdert. + + 1 + + + + User email set as verified + Gebruiker e-mail gezet als geverifieerd + + 1 + + + + Account muted. + Account gedempt. + + 1 + + + + Instance muted. + Instantie gedempt. + + 1 + + + + Account muted by the instance. + Account gedempt door de instantie. + + 1 + + + + Account unmuted by the instance. + Account niet meer gedempt door de instantie. + + 1 + + + + Instance muted by the instance. + Instantie gedempt door de instantie. + + 1 + + + + Instance unmuted by the instance. + Instantie niet meer gedempt door de instantie. + + 1 + + + + Mute this account + Demp dit account + + 1 + + + + Unmute this account + Dempt dit account niet meer + + 1 + + + + Mute the instance + Demp de instantie + + 1 + + + + Unmute the instance + Demp de instantie niet meer + + 1 + + + + Mute this account by your instance + Demp dit account door jouw instantie + + 1 + + + + Unmute this account by your instance + Demp dit account niet meer door jouw instantie + + 1 + + + + Mute the instance by your instance + Demp de instantie door jouw instantie + + 1 + + + + Unmute the instance by your instance + Demp de instantie niet meer door jouw instantie + + 1 + + + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. + Verzoek te groot voor de server. Alstublieft bereikt de administrator als je de limietgrote wilt vergroten. + + 1 + + + + Too many attempts, please try again after minutes. + Te vaak geprobeerd, probeer alstublieft weer na minuten. + + 1 + + + + Too many attempts, please try again later. + Te vaak geprobeerd, probeer alstublieft later. + + 1 + + + + Server error. Please retry later. + Serverfout. Probeer later alstublieft weer. + + 1 + + + + Subscribed to + Abonneer op + + 1 + + + + Subscribed + Geabonneert + + 1 + + + + Unsubscribed from + Ongeabonneert van + + 1 + + + + Unsubscribed + Ongeabonneert + + 1 + + + + Moderator + Beheerder + + 1 + + + + Only I can see this video + Ik kan deze video alleen zien + + 1 + + + + Only people with the private link can see this video + Alleen mensen met de privélink kunnen deze video zien + + 1 + + + + Anyone can see this video + Iedereen kan deze video zien + + 1 + + + + Welcome! Now please check your emails to verify your account and complete signup. + Welkom! Check alstublieft nu jouw e-mails om jouw accont te verifieren en de inschrijving te voltooien + + 1 + + + + You are now logged in as ! + Je bent nu ingelogd als ! + + 1 + + + + Video to import updated. + Video naar import bijgewerkt. + + 1 + + + + Your video was uploaded to your account and is private. + Jouw video is geupload naar jouw account en is privé. + + + 1 + + + + But associated data (tags, description...) will be lost, are you sure you want to leave this page? + Maar geassocieerde data(tags, beschrijving...) zullen verloren raken, weet je zeker dat je deze pagina wilt verlaten? + + 1 + + + + Your video is not uploaded yet, are you sure you want to leave this page? + Jouw video is nog niet geupload, weet je zeker dat je deze pagina wilt verlaten? + + 1 + + + + Upload cancelled + Upload geannuleerd + + 1 + + + + Your video quota is exceeded with this video (video size: , used: , quota: ) + Jouw videoquotum is overschreden met deze video (videogrootte: , gebruikt: , quotum: ) + + 1 + + + + Your daily video quota is exceeded with this video (video size: , used: , quota: ) + Jouw dagelijkse videoquotum is overschreden met deze video (videogrootte: , gebruikt: , quotum: ) + + 1 + + + + Video published. + Video gepubliceerd. + + 1 + + + + Video updated. + Video geupdate. + + 1 + + + + replies will be deleted too. + reacties zullen ook worden verwijdert. + + 1 + + + + Video blacklisted. + Video op de zwarte lijst. + + 1 + + + + Copied + Gekopieerd + + 1 + + + + Video reported. + Video gerapporteerd. + + 1 + + + + Start at + Start op + + 1 + + + + Like the video + Like de video + + 1 + + + + Dislike the video + Dislike de video + + 1 + + + + Do you really want to delete this video? + Weet je zeker dat je de video wil verwijderen? + + 1 + + + + likes / dislikes + likes / dislikes + + 1 + + + + This video contains mature or explicit content. Are you sure you want to watch it? + Deze video bevat volwassen of expliciete inhoud. Weet je zeker dat je hem wilt kijken? 1 - - Display name must be at least 3 characters long. - Je weergavenaam moet minstens 3 tekens lang zijn. + + Mature or explicit content + Volwassen of expliciete content 1 - - Display name cannot be more than 120 characters long. - Je weergavenaam kan niet langer dan 120 tekens zijn. + + Videos from your subscriptions + Videos van jou abonnementen 1 diff --git a/client/src/locale/target/angular_oc.xml b/client/src/locale/target/angular_oc.xml index 26ff5264e..106de7d5e 100644 --- a/client/src/locale/target/angular_oc.xml +++ b/client/src/locale/target/angular_oc.xml @@ -227,6 +227,57 @@ 11 + + You don't have notifications. + Avètz pas cap de notificacion. + + 1 + + + + + published a new video + + + a publicat una nòva vidèo + + + 7 + + + + + commented your video + + + a comentat vòstra vidèo + + + 23 + + + + + Your video has been published + + + Vòstra vidèo es publicada + + + 27 + + + + + + + + + + + 57 + + Unlisted Pas listada @@ -434,6 +485,13 @@ 25 + + + + + 11 + + Login @@ -499,7 +557,7 @@ Password Senhal - 12 + 13 @@ -513,7 +571,7 @@ Login Connexion - 38 + 36 @@ -541,7 +599,7 @@ Send me an email to reset my password Me mandar un corrièl per reïnicializar lo senhal - 75 + 80 @@ -610,7 +668,7 @@ Signup Inscripcion - 88 + 78 @@ -680,7 +738,18 @@ Change the language Cambiar la lenga - 88 + 86 + + + + + Help to translate PeerTube! + + + Ajudatz a traduire PeerTube ! + + + 8 @@ -691,7 +760,7 @@ Mon perfil public - 18 + 16 @@ -702,7 +771,7 @@ Mon compte - 22 + 20 @@ -713,7 +782,7 @@ Mas vidèos - 26 + 24 @@ -724,14 +793,14 @@ Desconnexion - 30 + 28 Create an account Crear un compte - 39 + 37 @@ -745,49 +814,49 @@ Subscriptions Abonaments - 47 + 45 Overview Apercebut - 52 + 50 Trending Tendéncias - 57 + 55 Recently added Apondons recents - 62 + 60 Local Localas - 67 + 65 More Mai - 72 + 70 Administration Administracion - 76 + 74 @@ -801,14 +870,42 @@ Show keyboard shortcuts Mostrar los acorchis clavièr - 91 + 89 Toggle dark interface Passar a l’interfàcia escura - 94 + 92 + + + + View your notifications + Veire vòstras notificacions + + 3 + + + + Notifications + Notificacions + + 10 + + + + Update your notification preferences + Actualizar vòstras preferéncias de notificacion + + 15 + + + + See all your notifications + Veire totas vòstras notificacions + + 22 @@ -913,14 +1010,14 @@ Display unlisted and private videos Mostrar las vidèos pas listadas e las privadas - 11 + 14 No results. Cap de resultat - 17 + 20 @@ -978,67 +1075,78 @@ 7 - - - About instance - - - A prepaus de l’instància - + + Contact administrator + Contactar l’administrator de - 1 + 3 - - Description - Descripcion + + Your name + Vòstre nom - 27 + 11 - - Terms - Tèrmes + + Your email + Vòstra adreça - 44 + 20 - - User registration is allowed and - Las inscripcions son autorizadas e + + Your message + Vòstre messatge - 25 + 29 - + - this instance provides a baseline quota of space for the videos of its users. - + Cancel + - aquesta instància provesís un quòta de basa de d’espaci per las vidèos de sos utilizaires. - + Anullar + - 27 + 26 - - - this instance provides unlimited space for the videos of its users. - - - aquesta instància fornís un espaci sens limit per las vidèos de sos utilizaires. - + + Submit + Mandar 31 - - - User registration is currently not allowed. - - Las inscriptions son pas pel moment possiblas + + About instance + A prepaus de l’instància - 36 + 4 + + + + Description + Descripcion + + 27 + + + + Terms + Tèrmes + + 39 + + + + User registration is allowed and + Las inscripcions son autorizadas e + + 29 @@ -1393,49 +1501,49 @@ Short description Descripcion corta - 22 + 21 Default client route Rota del client per defaut - 55 + 48 Videos Overview Apercebuts de las vidèos - 58 + 51 Videos Trending Vidèos a la mòda - 59 + 52 Videos Recently Added Vidèos ajustadas recentament - 60 + 53 Local videos Vidèos localas - 61 + 54 Policy on videos containing sensitive content Politica tocant las vidèos amb de contengut sensible - 70 + 61 @@ -1470,23 +1578,44 @@ Signup enabled Inscripcions activadas - 93 + 84 Signup requires email verification L’inscripcion demanda una verificacion d’adreça electronica - 100 + 91 Signup limit Limit d’inscripcions + + 96 + + + + Users + Utilizaires 105 + + User default video quota + Quòta per defaut per utilizaire + + 109 + + + + User default daily upload limit + Quòta jornalièr de mandadís per defaut dels utilizaires + + 121 + + Import Importar @@ -1498,49 +1627,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Import vidèo amb URL HTTP (per exemple YouTube) activat - 120 + 141 Video import with a torrent file or a magnet URI enabled Import de vidèos via un fichièr torretn o un magnet URI activat - 127 + 148 Administrator Administrator - 131 + 155 Admin email Adreça de l’admin - 134 - - - - Users - Utilizaires - - 144 - - - - User default video quota - Quòta per defaut per utilizaire - - 147 - - - - User default daily upload limit - Quòta jornalièr de mandadís per defaut dels utilizaires - - 161 + 158 @@ -1561,30 +1669,19 @@ Your Twitter username Vòstre nom d’utilizaire Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica lo compte Twitter del site o de la plataforma ont lo contengut foguèt publicat. - 184 + 187 Instance whitelisted by Twitter Instàncias en lista blanca per Twitter - - 198 - - - - If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> - Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. - Se vòstra instància es mesa en lista blanca per Twitter, un lector vidèo serà integrat pel fil Twitter sul partatge d’una vidèo PeerTube.<br /> - Se l’instància es pas en lista blanca, utilizam un imatge amb un ligam que mena a l’instància PeerTube.<br /><br /> - Clicatz aquesta bóstia, salvagardatz la configuracion e ensajatz amb l’URL d’una vidèo de vòstra instància (https://exemple.com/videos/watch/blabla) sus <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> per veire se vòstra instància es en lista blanca. 199 @@ -1600,35 +1697,35 @@ Transcoding Transcodatge - 210 + 215 Transcoding enabled Transcodatge activat - 215 + 221 If you disable transcoding, many videos from your users will not work! Se desactivatz lo transcodatge, un fum de vidèos de vòstres utilizaires foncionaràn pas ! - 216 + 222 Transcoding threads Transcodatge dels threads - 223 + 237 Resolution enabled Resolucion activada - 239 + 252 @@ -1643,82 +1740,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Qualques fichièrs son pas federats (apercebuts, legendas). Los recuperam de l’instància d’origina estant e los metèm en cache. - 249 + 265 Previews cache size Talha del cache d’apercebut - 254 + 271 Video captions cache size Talha del cache per las legendas de las vidèos - 265 + 280 Customizations Personalizacions - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escrivètz dirèctament de JavaScript còdi.<br />Exemple : <pre>console.log('mon instància es tròp crana');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Escrivètz dirèctament lo còdi CSS. Exemple :<br /> - <pre> - body - background-color: red; - - </pre> - - Prefixatz amb <em>#custom-css</em> per subrecargar los estiles. Exemple : - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1727,21 +1789,21 @@ Advanced configuration Configuracion avançada - 207 + 212 Update configuration Actualizar la configuracion - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Sembla que la configuracion es invalida. Mercés de cercar d’errors possiblas pels diferents onglets. - 326 + 341 @@ -2037,21 +2099,21 @@ User's email must be verified to login Lo corrièl de l’utilizaire deu èsser verificat abans la connexion - 70 + 72 User's email is verified / User can login without email verification Lo corrièl de l’utilizaire es verificat / Pòt se connectar sens verificacion de l’adreça - 74 + 76 Ban reason: Rason del bandiment : - 92 + 95 @@ -2118,7 +2180,7 @@ Actions Accions - 33 + 35 @@ -2153,14 +2215,14 @@ Date Data - 10 + 11 Blacklist reason: Rason de la mesa en lista negra : - 41 + 43 @@ -2184,102 +2246,39 @@ 7 - - Muted accounts - Comptes muts - - 2 - - - - Muted servers - Servidors muts - - 11 - - - - Account - Compte - - 12 - - - - Muted at - Mut lo - - 13 - - - - Unmute - Restablir - - 23 - - - - My settings - Mos paramètres - - 3 - - - - My library - Ma bibliotèca - - 7 - - - - My channels - Mas cadenas - - 12 - - - - My videos - Mas vidèos - - 14 - - - - My subscriptions - Mos abonaments + + Muted accounts + Comptes muts - 16 + 2 - - My imports - Mas importacions + + Muted servers + Servidors muts - 18 + 11 - - Misc - Divèrs + + Account + Compte - 24 + 12 - - Muted instances - Instàncias mudas + + Muted at + Mut lo - 2 + 13 - - Ownership changes - Cambiaments de proprietats + + Unmute + Restablir - 33 + 23 @@ -2293,21 +2292,21 @@ Profile Perfil - 8 + 7 Video settings Paramètres vidèo - 15 + 16 Danger zone Zòna perilhosa - 18 + 19 @@ -2335,13 +2334,6 @@ 35 - - Submit - Mandar - - 24 - - - views - vistas @@ -2500,6 +2492,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 47 + + Muted instances + Instàncias mudas + + 2 + + Change password Cambiar lo senhal @@ -2598,6 +2597,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 4 + + Web + Site web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2748,14 +2754,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Publish will be available when upload is finished La publicacion serà possibla un còp lo mandadís acabat - 53 + 58 Publish Publicar - 60 + 65 @@ -2938,14 +2944,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Wait transcoding before publishing the video Esperar lo transcodatge abans de publicar la vidèo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se decidissètz d’esperar pas lo transcodatge abans de publicar la vidèo, serà pas legibla fins a la fin del transcodatge. - 131 + 132 @@ -2959,49 +2965,49 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Add another caption Ajustar una legenda mai - 146 + 147 See the subtitle file Veire lo fichièr de sostítols - 155 + 156 Already uploaded ✔ Ja enviada ✔ - 159 + 160 Will be created on update Serà creada en actualizar - 167 + 168 Cancel create Anullar la creacion - 169 + 170 Will be deleted on update Serà suprimida en actualizar - 175 + 176 Cancel deletion Anullar la supression - 177 + 178 @@ -3012,28 +3018,28 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Encara cap de legendas. - 182 + 183 Captions Legendas - 139 + 140 Upload thumbnail Enviar una vinheta d’apercebut - 195 + 196 Upload preview Enviar un apercebut - 202 + 203 @@ -3047,14 +3053,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Short text to tell people how they can support you (membership platform...). Pichon tèxte per explicar al monde cossí pòdon vos sosténer (plataforma pels sòcis...). - 209 + 210 Advanced settings Paramètres avançats - 190 + 191 @@ -3121,17 +3127,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 3 - - - Cancel - - - Anullar - - - 19 - - Share Partejar @@ -3518,13 +3513,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 14 - - Error getting about from server - Error en recuperar las informacions de la seccion «A prepaus» del servidor - - 1 - - No description Cap de descripcion @@ -3546,13 +3534,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Error - Error - - 1 - - 240p 240p @@ -3595,13 +3576,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Success - Succès - - 1 - - Configuration updated. Configuracion actualizada. @@ -3987,6 +3961,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Preferences saved + Preferéncias salvagardadas + + 1 + + Profile updated. Perfil actualizat @@ -4036,23 +4017,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Volètz vertadièrament suprimir  ? Aquò suprimarà tanben totas las vidèos enviadas a la cadena. - - 1 - - - - Please type the name of the video channel to confirm - Tornatz picar lo nom de la cadena per confirmar + + Video channel deleted. + Cadena vidèo suprimida. 1 - - Video channel deleted. - Cadena vidèo suprimida. + + My videos + Mas vidèos 1 @@ -4127,16 +4101,58 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Channels - Cadenas + + My library + Ma bibliotèca + + 1 + + + + My channels + Mas cadenas + + 1 + + + + My subscriptions + Mos abonaments + + 1 + + + + My history + Mon istoric + + 1 + + + + Misc + Divèrs + + 1 + + + + Ownership changes + Cambiaments de proprietats + + 1 + + + + My settings + Mos paramètres 1 - - Video imports - Imports vidèo + + My notifications + Mas notificacions 1 @@ -4262,6 +4278,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Error + Error + + 1 + + You need to reconnect. Vos cal vos reconnectar. @@ -4283,6 +4306,20 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Info + Info + + 1 + + + + Success + Succès + + 1 + + Incorrect username or password. Nom d’utilizaire o senhal incorrècte. @@ -4500,58 +4537,58 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Username is required. - Lo nom d’utilizaire es requesit. + + Email is required. + L’adreça electronica es requesida. 1 - - Password is required. - Lo senhal es requesit. + + Email must be valid. + L’adreça electronica deu èsser valida. 1 - - Confirmation of the password is required. - La confirmacion del senhal es requesida. + + Your name is required. + Vòstre nom es requesit 1 - - Username must be at least 3 characters long. - Lo nom d’utilizaire deu conténer almens 3 caractèrs. + + Username is required. + Lo nom d’utilizaire es requesit. 1 - - Username cannot be more than 20 characters long. - Lo nom d’utilizaire pòt pas conténer mai de 20 caractèrs. + + Password is required. + Lo senhal es requesit. 1 - - Username should be only lowercase alphanumeric characters. - Lo nom d’utilizaire deu èsser alfanumeric e en minuscula. + + Confirmation of the password is required. + La confirmacion del senhal es requesida. 1 - - Email is required. - L’adreça electronica es requesida. + + Username must be at least 1 character long. + Lo nom d’utilizaire deu almens conténer 1 caractèr. 1 - - Email must be valid. - L’adreça electronica deu èsser valida. + + Username cannot be more than 50 characters long. + Lo nom d’utilizaire pòt pas conténer mai de 50 caractèrs. 1 @@ -4619,16 +4656,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Display name must be at least 3 characters long. - L’escais-nom deu almens conténer 3 caractèrs. + + Display name must be at least 1 character long. + Lo nom public deu almens conténer 1 caractèr. 1 - - Display name cannot be more than 120 characters long. - L’escais-nom pòt pas conténer mai de 120 caractèrs. + + Display name cannot be more than 50 characters long. + Lo nom public pòt pas conténer mai de 50 caractèrs. 1 @@ -4682,13 +4719,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Report reason cannot be more than 300 characters long. - La rason del senhalament pòt pas conténer mai de 300 caractèrs. - - 1 - - Moderation comment is required. Lo comentari de moderacion es requesit. @@ -4703,13 +4733,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Moderation comment cannot be more than 300 characters long. - Lo comentari de moderacion pòt pas conténer mai de 300 caractèrs. - - 1 - - The channel is required. La cadena es requesida. @@ -4766,23 +4789,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Name must be at least 3 characters long. - Lo nom deu almens conténer 3 caractèrs. - - 1 - - - - Name cannot be more than 20 characters long. - Lo nom pòt pas conténer mai de 20 caractèrs. + + Name must be at least 1 character long. + Lo nom deu almens conténer 1 caractèr. 1 - - Name should be only lowercase alphanumeric characters. - Lo nom deu èsser alfanumeric e en minuscula + + Name cannot be more than 50 characters long. + Lo nom pòt pas conténer mai de 50 caractèrs. 1 @@ -5599,13 +5615,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Subscribed - Abonat - - 1 - - Subscribed to S’abonèt a @@ -5613,9 +5622,9 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Unsubscribed - Pas mai abonat + + Subscribed + Abonat 1 @@ -5627,6 +5636,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Unsubscribed + Pas mai abonat + + 1 + + Moderator Moderator @@ -5697,13 +5713,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Info - Info - - 1 - - Upload cancelled Mandadís anullat @@ -5711,13 +5720,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - We are sorry but PeerTube cannot handle videos > 8GB - O planhèm mas PeerTube pòt pas gerir de vidèos de mai de 8 Go - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Vòstre quòta de vidèo es excedit amb aquesta vidèo (talha vidèo : , utilizat : , quòta : ) diff --git a/client/src/locale/target/angular_pl_PL.xml b/client/src/locale/target/angular_pl_PL.xml index e8494997a..6d5a06e53 100644 --- a/client/src/locale/target/angular_pl_PL.xml +++ b/client/src/locale/target/angular_pl_PL.xml @@ -342,7 +342,7 @@ Password Hasło - 12 + 13 @@ -356,7 +356,7 @@ Login Zaloguj się - 38 + 36 @@ -384,7 +384,7 @@ Send me an email to reset my password Wyślij mi wiadomość e-mail przywracającą hasło - 75 + 80 @@ -448,7 +448,7 @@ Signup Zarejestruj się - 88 + 78 @@ -498,7 +498,7 @@ Change the language Zmień język - 88 + 86 @@ -509,7 +509,7 @@ Mój profil publiczny - 18 + 16 @@ -520,7 +520,7 @@ Moje konto - 22 + 20 @@ -531,7 +531,7 @@ Moje filmy - 26 + 24 @@ -542,14 +542,14 @@ Wyloguj się - 30 + 28 Create an account Utwórz konto - 39 + 37 @@ -563,49 +563,49 @@ Subscriptions Subskrybcje - 47 + 45 Overview Przegląd - 52 + 50 Trending Na czasie - 57 + 55 Recently added Ostatnio dodane - 62 + 60 Local Lokalne - 67 + 65 More Więcej - 72 + 70 Administration Administracja - 76 + 74 @@ -619,7 +619,7 @@ Toggle dark interface Przełącz ciemny interfejs - 94 + 92 @@ -724,7 +724,7 @@ No results. Brak wyników. - 17 + 20 @@ -771,15 +771,22 @@ 7 - + - About instance - + Cancel + - O instancji - + Anuluj + - 1 + 26 + + + + Submit + Wyślij + + 31 @@ -793,47 +800,14 @@ Terms Zasady - 44 + 39 User registration is allowed and Rejestracja użytkowników jest dozwolona i - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - ta instancja oferuje podstawową powierzchnię na filmy swoich użytkowników. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - ta instancja oferuje nieograniczoną powierzchnię na filmy dla swoich użytkowników. - - - 31 - - - - - User registration is currently not allowed. - - - Rejestracja użytkowników nie jest obecnie dozwolona. - - - 36 + 29 @@ -1118,47 +1092,47 @@ Short description Krótki opis - 22 + 21 Default client routeDefault client route - 55 + 48 Videos Overview Przegląd Filmów - 58 + 51 Videos Trending Filmy na czasie - 59 + 52 Videos Recently Added Ostatnio dodane filmy - 60 + 53 Local videos Lokalne filmy - 61 + 54 Policy on videos containing sensitive content Polityka dotycząca filmów zawierających wrażliwą zawartość - 70 + 61 @@ -1193,23 +1167,44 @@ Signup enabled Wymagana rejestracja - 93 + 84 Signup requires email verification Rejestracja wymaga weryfikacji emaila - 100 + 91 Signup limit Limit rejestracji + + 96 + + + + Users + Użytkownicy 105 + + User default video quota + Domyślna powierzchnia na filmy dla użytkownika + + 109 + + + + User default daily upload limit + Domyślny limit dziennego wysyłania przez użytkownika + + 121 + + Import Importuj @@ -1221,35 +1216,14 @@ Administrator Administrator - 131 + 155 Admin email E-mail administratora - 134 - - - - Users - Użytkownicy - - 144 - - - - User default video quota - Domyślna powierzchnia na filmy dla użytkownika - - 147 - - - - User default daily upload limit - Domyślny limit dziennego wysyłania przez użytkownika - - 161 + 158 @@ -1270,21 +1244,21 @@ Your Twitter username Twoja nazwa użytkownika na Twitterze - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Oznacza konto Twittera dla strony lub platformy na której została opublikowana zawartość. - 184 + 187 Instance whitelisted by Twitter Instancja jest na białej liście Twittera - 198 + 199 @@ -1298,35 +1272,35 @@ Transcoding Transkodowanie - 210 + 215 Transcoding enabled Transkodowanie jest włączone - 215 + 221 If you disable transcoding, many videos from your users will not work! Jeżeli wyłączysz transkodowanie, wiele filmów od użytkowników może nie działać! - 216 + 222 Transcoding threads Wątki transkodowania - 223 + 237 Resolution enabled Włączono rozdzielczość - 239 + 252 @@ -1341,56 +1315,56 @@ - 244 + 260 Previews cache size Rozmiar pamięci podręcznej podglądu - 254 + 271 Customizations Dostosowywanie - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Wprowadź kod JavaScript.<br />Przykład: <pre>console.log('moja instancja jest świetna');</pre> - 281 + 297 Advanced configuration Zaawansowana konfiguracja - 207 + 212 Update configuration Aktualizuj konfigurację - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Wygląda na to, że konfiguracja jest nieprawidłowa. Poszukaj możliwych błędów w innych kartach. - 326 + 341 @@ -1669,7 +1643,7 @@ Actions Akcje - 33 + 35 @@ -1683,7 +1657,7 @@ Date Data - 10 + 11 @@ -1700,48 +1674,6 @@ 7 - - My settings - Moje ustawienia - - 3 - - - - My library - Moja biblioteka - - 7 - - - - My channels - Moje kanały - - 12 - - - - My videos - Moje filmy - - 14 - - - - My subscriptions - Moje subskrybcje - - 16 - - - - My imports - Moje importy - - 18 - - Video quota: Powierzchnia na filmy: @@ -1753,14 +1685,14 @@ Profile Profil - 8 + 7 Video settings Ustawienia wideo - 15 + 16 @@ -1774,13 +1706,6 @@ 35 - - Submit - Wyślij - - 24 - - - views - wyświetlenia @@ -2012,14 +1937,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Publish will be available when upload is finished Opublikuj automatycznie po ukończeniu wysyłania - 53 + 58 Publish Opublikuj - 60 + 65 @@ -2131,7 +2056,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Wait transcoding before publishing the video Poczekaj na transkodowanie przed opublikowaniem filmu - 130 + 131 @@ -2145,14 +2070,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Upload thumbnail Wyślij miniaturę - 195 + 196 Upload preview Podgląd wysyłania - 202 + 203 @@ -2166,14 +2091,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Short text to tell people how they can support you (membership platform...). Krótki tekst informujący innych, jak mogą Cię wesprzeć (platforma członkowska…). - 209 + 210 Advanced settings Ustawienia zaawansowane - 190 + 191 @@ -2240,17 +2165,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 3 - - - Cancel - - - Anuluj - - - 19 - - Share Udostępnij @@ -2526,13 +2440,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 14 - - Error getting about from server - Błąd podczas uzyskiwania informacji z serwera - - 1 - - No description Brak opisu @@ -2554,13 +2461,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Error - Błąd - - 1 - - 240p 240p @@ -2596,13 +2496,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Success - Pomyślnie - - 1 - - Configuration updated. Zaktualizowano konfigurację. @@ -2848,23 +2741,16 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Czy na pewno chcesz usunąć ? Skutkuje to usunięciem wszystkich filmów wysłanych na ten kanał. - - 1 - - - - Please type the name of the video channel to confirm - Wprowadź nazwę kanału wideo, aby potwierdzić + + Video channel deleted. + Usunięto kanał wideo . 1 - - Video channel deleted. - Usunięto kanał wideo . + + My videos + Moje filmy 1 @@ -2925,9 +2811,30 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Channels - Kanały + + My library + Moja biblioteka + + 1 + + + + My channels + Moje kanały + + 1 + + + + My subscriptions + Moje subskrybcje + + 1 + + + + My settings + Moje ustawienia 1 @@ -2955,6 +2862,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Error + Błąd + + 1 + + You need to reconnect. Musisz połączyć się ponownie. @@ -2969,6 +2883,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Info + Informacja + + 1 + + + + Success + Pomyślnie + + 1 + + Your password has been successfully reset! Pomyślnie zresetowano hasło! @@ -3130,6 +3058,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Email is required. + Adres e-mail jest wymagany. + + 1 + + + + Email must be valid. + Adres e-mail musi być prawidłowy. + + 1 + + Username is required. Nazwa użytkownika jest wymagana. @@ -3151,41 +3093,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Username must be at least 3 characters long. - Nazwa użytkownika musi zawierać przynajmniej 3 znaki. - - 1 - - - - Username cannot be more than 20 characters long. - Nazwa użytkownika nie może być dłuższa niż 20 znaków. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Nazwa użytkownika może zawierać tylko małe znaki alfanumeryczne. - - 1 - - - - Email is required. - Adres e-mail jest wymagany. - - 1 - - - - Email must be valid. - Adres e-mail musi być prawidłowy. - - 1 - - Password must be at least 6 characters long. Hasło musi składać się z przynajmniej 6 znaków. @@ -3235,20 +3142,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Display name must be at least 3 characters long. - Nazwa wyświetlana musi zawierać przynajmniej 3 znaki. - - 1 - - - - Display name cannot be more than 120 characters long. - Nazwa wyświetlana nie może zawierać więcej niż 120 znaków. - - 1 - - Description must be at least 3 characters long. Opis musi zawierać przynajmniej 3 znaki. @@ -3270,13 +3163,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Report reason cannot be more than 300 characters long. - Przyczyna zgłoszenia nie może zawierać więcej niż 300 znaków. - - 1 - - The username is required. Nazwa użytkownika jest wymagana. @@ -3291,27 +3177,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Name must be at least 3 characters long. - Nazwa musi zawierać przynajmniej 3 znaki. - - 1 - - - - Name cannot be more than 20 characters long. - Nazwa nie może być dłuższa niż 20 znaków. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Nazwa może zawierać tylko małe znaki alfanumeryczne. - - 1 - - Support text must be at least 3 characters long. Tekst o wsparciu musi zawierać przynajmniej 3 znaki. @@ -4003,13 +3868,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Info - Informacja - - 1 - - Upload cancelled Anulowano wysyłanie diff --git a/client/src/locale/target/angular_pt_BR.xml b/client/src/locale/target/angular_pt_BR.xml index 71aeac8d5..0227115e3 100644 --- a/client/src/locale/target/angular_pt_BR.xml +++ b/client/src/locale/target/angular_pt_BR.xml @@ -370,7 +370,7 @@ Password Senha - 12 + 13 @@ -384,7 +384,7 @@ Login Entrar - 38 + 36 @@ -412,7 +412,7 @@ Send me an email to reset my password Me envie um e-mail para redefinir minha senha - 75 + 80 @@ -476,7 +476,7 @@ Signup Inscrever-se - 88 + 78 @@ -533,7 +533,7 @@ Change the language Alterar o idioma - 88 + 86 @@ -544,7 +544,7 @@ Meu perfil público - 18 + 16 @@ -555,7 +555,7 @@ Minha conta - 22 + 20 @@ -566,7 +566,7 @@ Meus vídeos - 26 + 24 @@ -577,14 +577,14 @@ Sair - 30 + 28 Create an account Criar uma conta - 39 + 37 @@ -598,49 +598,49 @@ Subscriptions Inscrições - 47 + 45 Overview Visão geral - 52 + 50 Trending Tendências - 57 + 55 Recently added Adicionado recentemente - 62 + 60 Local Local - 67 + 65 More Mais - 72 + 70 Administration Administração - 76 + 74 @@ -654,7 +654,7 @@ Toggle dark interface Alternar interface escura - 94 + 92 @@ -759,7 +759,7 @@ No results. Nenhum resultado. - 17 + 20 @@ -806,15 +806,22 @@ 7 - + - About instance - + Cancel + - Sobre a instância - + Cancelar + - 1 + 26 + + + + Submit + Enviar + + 31 @@ -828,47 +835,14 @@ Terms Termos - 44 + 39 User registration is allowed and Registro de usuários não está permitida e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - esta instância fornece uma cota base de espaço para os vídeos de seus usuários. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - esta instância fornece espaço ilimitado para os vídeos de seus usuários. - - - 31 - - - - - User registration is currently not allowed. - - - Registro de usuários atualmente não está permitido. - - - 36 + 29 @@ -1177,49 +1151,49 @@ Short description Descrição curta - 22 + 21 Default client route Rota padrão do cliente - 55 + 48 Videos Overview Visão geral dos vídeos - 58 + 51 Videos Trending Vídeos em Tendência - 59 + 52 Videos Recently Added Vídeos Adicionados Recentemente - 60 + 53 Local videos Vídeos locais - 61 + 54 Policy on videos containing sensitive content Política sobre vídeos que possuem conteúdo sensível - 70 + 61 @@ -1254,23 +1228,44 @@ Signup enabled Inscrição permitida - 93 + 84 Signup requires email verification Inscrição requer verificação de email - 100 + 91 Signup limit Limite de inscrições + + 96 + + + + Users + Usuários 105 + + User default video quota + Cota padrão de vídeos do usuário + + 109 + + + + User default daily upload limit + Padrão de limite diário de upload + + 121 + + Import Importar @@ -1282,42 +1277,21 @@ Video import with a torrent file or a magnet URI enabled Importação de vídeo com um arquivo torrent ou URI magnética habilitada - 127 + 148 Administrator Administrador - 131 + 155 Admin email Email de administrador - 134 - - - - Users - Usuários - - 144 - - - - User default video quota - Cota padrão de vídeos do usuário - - 147 - - - - User default daily upload limit - Padrão de limite diário de upload - - 161 + 158 @@ -1338,21 +1312,21 @@ Your Twitter username Seu nome de usuário no Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica a conta Twitter do sítio web ou plataforma em que o conteúdo foi publicado. - 184 + 187 Instance whitelisted by Twitter Instância listada como permitida pelo Twitter - 198 + 199 @@ -1366,35 +1340,35 @@ Transcoding Transcodificação - 210 + 215 Transcoding enabled Transcodificação ativada - 215 + 221 If you disable transcoding, many videos from your users will not work! Se você desativar a transcodificação, muitos vídeos dos seus usuários não funcionarão! - 216 + 222 Transcoding threads Threads de transcodificação - 223 + 237 Resolution enabled Resolução habilitada - 239 + 252 @@ -1409,82 +1383,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Alguns arquivos não são federados (pré-visualizações, legendas ocultas). Nós as obtivemos diretamente da instância de origem e a colocamos em cache. - 249 + 265 Previews cache size Tamanho do cache de pré-visualizações - 254 + 271 Video captions cache size Tamanho do cache de legendas ocultas de vídeos - 265 + 280 Customizations Personalizações - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escreva diretamente código JavaScript.<br />Exemplo: <pre>console.log('minha instância é demais');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Escreva código CSS diretamente. Exemplo:<br /> - <pre> - body - background-color: red; - - </pre> - - Preceda com <em>#custom-css</em> para sobrescrever estilos. Exemplo: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1493,21 +1432,21 @@ Advanced configuration Configurações avançadas - 207 + 212 Update configuration Atualizar configuração - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Aparentemente a configuração está valida. Por favor procure potenciais erros nas diferentes abas. - 326 + 341 @@ -1761,7 +1700,7 @@ Ban reason: Motivo do banimento: - 92 + 95 @@ -1828,7 +1767,7 @@ Actions Ações - 33 + 35 @@ -1863,14 +1802,14 @@ Date Data - 10 + 11 Blacklist reason: Motivo da lista negra: - 41 + 43 @@ -1894,55 +1833,6 @@ 7 - - My settings - Minhas configurações - - 3 - - - - My library - Minha biblioteca - - 7 - - - - My channels - Meus canais - - 12 - - - - My videos - Meus vídeos - - 14 - - - - My subscriptions - Minhas inscrições - - 16 - - - - My imports - Minhas importações - - 18 - - - - Ownership changes - Mudanças de dono - - 33 - - Video quota: Cota de vídeo: @@ -1954,21 +1844,21 @@ Profile Perfil - 8 + 7 Video settings Configurações de vídeo - 15 + 16 Danger zone Zona perigosa - 18 + 19 @@ -1996,13 +1886,6 @@ 35 - - Submit - Enviar - - 24 - - - views - visualizações @@ -2162,6 +2045,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 30 + + Current password + Senha atual + + 7 + + New password Nova senha @@ -2368,14 +2258,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Publish will be available when upload is finished A publicação estará disponível quando o envio terminar - 53 + 58 Publish Publicar - 60 + 65 @@ -2537,14 +2427,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Wait transcoding before publishing the video Aguarde a transcodificação antes de publicar o vídeo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se você decidir não aguardar a transcodificação antes de publicar o vídeo, ele poderá não ser reproduzido até que a transcodificação termine. - 131 + 132 @@ -2558,49 +2448,49 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Add another caption Adicionar outra legenda oculta - 146 + 147 See the subtitle file Veja o arquivo de legenda - 155 + 156 Cancel create Cancelar criação - 169 + 170 Cancel deletion Cancelar exclusão - 177 + 178 Captions Legendas ocultas - 139 + 140 Upload thumbnail Enviar miniatura - 195 + 196 Upload preview Enviar pré-visualização - 202 + 203 @@ -2614,14 +2504,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Short text to tell people how they can support you (membership platform...). Texto curto para dizer às pessoas como elas podem apoiar você (plataforma de membros, etc.). - 209 + 210 Advanced settings Configurações avançadas - 190 + 191 @@ -2688,17 +2578,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 3 - - - Cancel - - - Cancelar - - - 19 - - Share Compartilhar @@ -3034,13 +2913,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 14 - - Error getting about from server - Erro ao obter detalhes do servidor - - 1 - - No description Nenhuma descrição @@ -3062,20 +2934,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Error - Erro - - 1 - - - - Success - Sucesso - - 1 - - Configuration updated. Configuração atualizada. @@ -3328,23 +3186,16 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Você realmente deseja excluir ? Isso também excluirá todos os vídeos enviados neste canal. - - 1 - - - - Please type the name of the video channel to confirm - Por favor, digite o nome do canal de vídeo para confirmar + + Video channel deleted. + Canal de vídeo excluído. 1 - - Video channel deleted. - Canal de vídeo excluído. + + My videos + Meus vídeos 1 @@ -3419,16 +3270,37 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Channels - Canais + + My library + Minha biblioteca 1 - - Video imports - Importações de vídeos + + My channels + Meus canais + + 1 + + + + My subscriptions + Minhas inscrições + + 1 + + + + Ownership changes + Mudanças de dono + + 1 + + + + My settings + Minhas configurações 1 @@ -3463,6 +3335,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Error + Erro + + 1 + + You need to reconnect. você precisa se reconectar. @@ -3477,6 +3356,20 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Info + Info + + 1 + + + + Success + Sucesso + + 1 + + Incorrect username or password. Nome de usuário ou senha incorretos. @@ -3694,6 +3587,20 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Email is required. + E-mail é necessário. + + 1 + + + + Email must be valid. + E-mail deve ser válido. + + 1 + + Username is required. Nome de usuário é necessário. @@ -3715,41 +3622,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Username must be at least 3 characters long. - Nome de usuário deve ter pelo menos 3 caracteres. - - 1 - - - - Username cannot be more than 20 characters long. - Nome de usuário não pode ter mais que 20 caracteres. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Nome de usuário deve ter apenas caracteres alfanuméricos minúsculos. - - 1 - - - - Email is required. - E-mail é necessário. - - 1 - - - - Email must be valid. - E-mail deve ser válido. - - 1 - - Password must be at least 6 characters long. Senha deve ter pelo menos 6 caracteres. @@ -3813,20 +3685,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Display name must be at least 3 characters long. - Nome de exibição deve ter pelo menos 3 caracteres. - - 1 - - - - Display name cannot be more than 120 characters long. - Nome de exibição não pode ter mais que 120 caracteres. - - 1 - - Description must be at least 3 characters long. Descrição deve ter pelo menos 3 caracteres. @@ -3869,13 +3727,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Report reason cannot be more than 300 characters long. - Motivo da denúncia não pode ter mais que 300 caracteres. - - 1 - - Moderation comment is required. Comentário de moderação é obrigatório. @@ -3890,13 +3741,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Moderation comment cannot be more than 300 characters long. - Comentário de moderação não pode ter mais de 300 caracteres. - - 1 - - The channel is required. O canal é obrigatório. @@ -3946,27 +3790,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Name must be at least 3 characters long. - Nome deve ter pelo menos 3 caracteres. - - 1 - - - - Name cannot be more than 20 characters long. - Nome não pode ter mais de 20 caracteres. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Nome deve ser apenas caracteres alfanuméricos minúsculos. - - 1 - - Support text must be at least 3 characters long. Texto de apoio deve ter pelo menos 3 caracteres. @@ -4646,13 +4469,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Subscribed - Inscrito - - 1 - - Subscribed to Inscrito em @@ -4660,9 +4476,9 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Unsubscribed - Desinscrito + + Subscribed + Inscrito 1 @@ -4674,6 +4490,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Unsubscribed + Desinscrito + + 1 + + Only I can see this video Apenas eu posso ver este vídeo @@ -4723,13 +4546,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Info - Info - - 1 - - Upload cancelled Envio cancelado @@ -4737,13 +4553,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Lamentamos, mas o PeerTube não consegue lidar com vídeos> 8GB - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Sua quota de vídeos é excedida com este vídeo (tamanho do vídeo: , utilizado: , quota: ) diff --git a/client/src/locale/target/angular_ru_RU.xml b/client/src/locale/target/angular_ru_RU.xml index db2a690d5..b3e2afb96 100644 --- a/client/src/locale/target/angular_ru_RU.xml +++ b/client/src/locale/target/angular_ru_RU.xml @@ -356,7 +356,7 @@ Password Пароль - 12 + 13 @@ -370,7 +370,7 @@ Login Авторизация - 38 + 36 @@ -398,7 +398,7 @@ Send me an email to reset my password Отправить пароль на электронную почту - 75 + 80 @@ -462,7 +462,7 @@ Signup Зарегистрироваться - 88 + 78 @@ -519,7 +519,7 @@ Change the language Изменить язык - 88 + 86 @@ -530,7 +530,7 @@ Мой побличный профиль - 18 + 16 @@ -541,7 +541,7 @@ Моя учетная запись - 22 + 20 @@ -552,7 +552,7 @@ Мои видео - 26 + 24 @@ -563,14 +563,14 @@ Выйти - 30 + 28 Create an account Создать учетную запись - 39 + 37 @@ -584,49 +584,49 @@ Subscriptions Подписки - 47 + 45 Overview Общий вид - 52 + 50 Trending Тенденции - 57 + 55 Recently added Недавно добавленный - 62 + 60 Local Локальный - 67 + 65 More Больше - 72 + 70 Administration Администрация - 76 + 74 @@ -640,7 +640,7 @@ Toggle dark interface Изменить интерфейс - 94 + 92 @@ -745,7 +745,7 @@ No results. Нет результатов - 17 + 20 @@ -792,15 +792,11 @@ 7 - - - About instance - - - О Инстанци - + + Submit + Отправить - 1 + 31 @@ -814,47 +810,14 @@ Terms Условия пользователя - 44 + 39 User registration is allowed and Создания учетной записи разрешено и - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - этот сервер предоставляет места для видео для пользователей. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - этот сервер предоставляет неограниченное место для пользователей. - - - 31 - - - - - User registration is currently not allowed. - - - Создание учетной записи не разрешено в данный момент. - - - 36 + 29 @@ -1163,49 +1126,49 @@ Short description Краткое описание - 22 + 21 Default client route Default client route - 55 + 48 Videos Overview Все видео - 58 + 51 Videos Trending Тенденции видео - 59 + 52 Videos Recently Added Недавно добавленное видео - 60 + 53 Local videos Местное видео - 61 + 54 Policy on videos containing sensitive content Политика касательно видео содержащих нежелательный контент - 70 + 61 @@ -1240,23 +1203,44 @@ Signup enabled Регистрация активирована - 93 + 84 Signup requires email verification Для регистрации нужно подтвержение через электронную почту - 100 + 91 Signup limit Лимит регистрации + + 96 + + + + Users + Пользователи 105 + + User default video quota + Квота видео по умолчанию на одного пользователя + + 109 + + + + User default daily upload limit + Ежедневный лимит загрузок по умолчанию на одгого пользователя + + 121 + + Import Импортировать @@ -1268,42 +1252,21 @@ Video import with a torrent file or a magnet URI enabled Импорт видео с помощью файла торент или magnet URI активирован - 127 + 148 Administrator Администратор - 131 + 155 Admin email Электронная почта администратора - 134 - - - - Users - Пользователи - - 144 - - - - User default video quota - Квота видео по умолчанию на одного пользователя - - 147 - - - - User default daily upload limit - Ежедневный лимит загрузок по умолчанию на одгого пользователя - - 161 + 158 @@ -1324,21 +1287,21 @@ Your Twitter username Ваше имя пользователя в Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Показывает учетнаю запись в Twitter сайта или платформы с которых было опубликован контент - 184 + 187 Instance whitelisted by Twitter Сервер имеет аккредитацию Twitter - 198 + 199 @@ -1352,35 +1315,35 @@ Transcoding Транскодирование - 210 + 215 Transcoding enabled Транскодирование активировано - 215 + 221 If you disable transcoding, many videos from your users will not work! Если вы дезактивируете транскодирование, многие видео пользователей перестанут работать - 216 + 222 Transcoding threads Количество threads для транскодирования - 223 + 237 Resolution enabled Разрешение активировано - 239 + 252 @@ -1395,82 +1358,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Некоторые миниатюры не федератные (миниатюры, названия). Они взяты непосредственно из их оригинального сервера и мы их не храним. - 249 + 265 Previews cache size Размер кеша предпросмотра - 254 + 271 Video captions cache size Размер кеша предпросмотра надписей - 265 + 280 Customizations Персонализация - 275 + 289 JavaScript Ява Скрипт - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Напишите непосредственно код Ява Скрипта .<br />Пример : <pre>console.log('мой сервер крут');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Напишите непосредственно код CSS. Пример:<br /> - <pre> - body - background-color: red; - - </pre> - - Начните с <em>#custom-css</em> чтоб получить приоритет. Пример: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1479,21 +1407,21 @@ Advanced configuration Продвинутая конфигурация - 207 + 212 Update configuration Обновить конфигурацию - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Конфигурация неудачная. Пожалуйста, найдите потенциальную ошибку в разных окнах. - 326 + 341 @@ -1740,7 +1668,7 @@ Ban reason: Причины бана: - 92 + 95 @@ -1807,7 +1735,7 @@ Actions Действия - 33 + 35 @@ -1842,14 +1770,14 @@ Date Дата - 10 + 11 Blacklist reason: Причина блокирования: - 41 + 43 @@ -1873,55 +1801,6 @@ 7 - - My settings - Мои настройки - - 3 - - - - My library - Моя библиотека - - 7 - - - - My channels - Мои каналы - - 12 - - - - My videos - Мои видео - - 14 - - - - My subscriptions - Мои подписки - - 16 - - - - My imports - Мои импортированные видео - - 18 - - - - Ownership changes - Смена собственника - - 33 - - Video quota: Квота видео @@ -1933,21 +1812,21 @@ Profile Профиль - 8 + 7 Video settings Настройки видео - 15 + 16 Danger zone Орасная зона - 18 + 19 @@ -1975,13 +1854,6 @@ 35 - - Submit - Отправить - - 24 - - - views - просмотры @@ -2279,6 +2151,48 @@ When you will upload a video in this channel, the video support field will be au 17 + + My videos + Мои видео + + 1 + + + + My library + Моя библиотека + + 1 + + + + My channels + Мои каналы + + 1 + + + + My subscriptions + Мои подписки + + 1 + + + + Ownership changes + Смена собственника + + 1 + + + + My settings + Мои настройки + + 1 + + Transcoding threads is required. Транскодирование потоки требуется. @@ -2307,13 +2221,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - Имя пользователя должно быть длиной не менее 3-х символов. - - 1 - - Password must be at least 6 characters long. Пароль должен быть длиной не менее 6 символов. @@ -2321,13 +2228,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - Отображаемое имя должно иметь длину не менее 3-х символов. - - 1 - - Description must be at least 3 characters long. Описание должно быть длиной не менее 3-х символов. @@ -2363,13 +2263,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - Длина имени должна быть не менее 3 символов. - - 1 - - Support text must be at least 3 characters long. Текст поддержки должен содержать не менее 3 символов. diff --git a/client/src/locale/target/angular_sv_SE.xml b/client/src/locale/target/angular_sv_SE.xml index eadcfa444..ffa8b19ca 100644 --- a/client/src/locale/target/angular_sv_SE.xml +++ b/client/src/locale/target/angular_sv_SE.xml @@ -499,7 +499,7 @@ Password Lösenord - 12 + 13 @@ -513,7 +513,7 @@ Login Logga in - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password Skicka ett e-postmeddelande för att återställa mitt lösenord - 75 + 80 @@ -612,7 +612,7 @@ Signup Registrering - 88 + 78 @@ -682,7 +682,7 @@ Change the language Ändra språk - 88 + 86 @@ -693,7 +693,7 @@ Min offentliga profil - 18 + 16 @@ -704,7 +704,7 @@ Mitt konto - 22 + 20 @@ -715,7 +715,7 @@ Mina videor - 26 + 24 @@ -726,14 +726,14 @@ Logga ut - 30 + 28 Create an account Skapa ett konto - 39 + 37 @@ -747,49 +747,49 @@ Subscriptions Prenumerationer - 47 + 45 Overview Översikt - 52 + 50 Trending Populärt - 57 + 55 Recently added Nyligen tillagt - 62 + 60 Local Lokalt - 67 + 65 More Mer - 72 + 70 Administration Administration - 76 + 74 @@ -803,14 +803,14 @@ Show keyboard shortcuts Visa kortkommandon - 91 + 89 Toggle dark interface Växla mörkt gränssnitt - 94 + 92 @@ -915,14 +915,14 @@ Display unlisted and private videos Visa olistade och privata videor - 11 + 14 No results. Inga resultat. - 17 + 20 @@ -980,15 +980,22 @@ 7 - + - About instance - + Cancel + - Om instansen - + Avbryt + - 1 + 26 + + + + Submit + Skicka + + 31 @@ -1002,47 +1009,14 @@ Terms Villkor - 44 + 39 User registration is allowed and Användarregistrering är tillåten och - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - den här instansen tillhandahåller en grundkvot på utrymme för sina användares videor. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - den här instansen tillhandahåller obegränsat utrymme för sina användares videor. - - - 31 - - - - - User registration is currently not allowed. - - - Användarregistrering tillåts inte för tillfället. - - - 36 + 29 @@ -1319,22 +1293,30 @@ - MutedMuted + Muted + Ignorerad + 13 - Muted by your instanceMuted by your instance + Muted by your instance + Ignorerad av din instans + 14 - Instance mutedInstance muted + Instance muted + Instans ignorerad + 15 - Instance muted by your instanceInstance muted by your instance + Instance muted by your instance + Instans ignorerad av din instans + 16 @@ -1391,49 +1373,49 @@ Short description Kort beskrivning - 22 + 21 Default client route Klientens standardrouting - 55 + 48 Videos Overview Videoöversikt - 58 + 51 Videos Trending Populära videor - 59 + 52 Videos Recently Added Nyligen tillagda videor - 60 + 53 Local videos Lokala videor - 61 + 54 Policy on videos containing sensitive content Policy för videor med känsligt innehåll - 70 + 61 @@ -1468,23 +1450,44 @@ Signup enabled Registrering aktiverad - 93 + 84 Signup requires email verification Registrering kräver e-postverifikation - 100 + 91 Signup limit Registreringsgräns + + 96 + + + + Users + Användare 105 + + User default video quota + Standardkvot för användares videor + + 109 + + + + User default daily upload limit + Standarduppladdningsgräns för användare + + 121 + + Import Importera @@ -1496,49 +1499,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Videoimport med HTTP-URL tillåten (t.ex. YouTube) - 120 + 141 Video import with a torrent file or a magnet URI enabled Videoimport med torrentfil eller magnet-URI är tillåten - 127 + 148 Administrator Administratör - 131 + 155 Admin email Administratörens e-postadress - 134 - - - - Users - Användare - - 144 - - - - User default video quota - Standardkvot för användares videor - - 147 - - - - User default daily upload limit - Standarduppladdningsgräns för användare - - 161 + 158 @@ -1559,21 +1541,21 @@ Your Twitter username Ditt användarnamn på Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Webbplatsens eller plattformens Twitterkonto, på vilken innehållet publicerades. - 184 + 187 Instance whitelisted by Twitter Instans vitlistad av Twitter - 198 + 199 @@ -1587,35 +1569,35 @@ Transcoding Omkodning - 210 + 215 Transcoding enabled Omkodning aktiverad - 215 + 221 If you disable transcoding, many videos from your users will not work! Om du avaktiverar omkodning, kommer många av dina användares videor inte fungera! - 216 + 222 Transcoding threads Omkodningstrådar - 223 + 237 Resolution enabled Upplösningen tillåten - 239 + 252 @@ -1630,82 +1612,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Vissa filer är inte federerade (till exempel förhandsvisningar och undertexter). Vi kan hämta dem direkt från ursprungsinstansen och cachelagra dem. - 249 + 265 Previews cache size Förhandsvisningens cachestorlek - 254 + 271 Video captions cache size Undertexternas cachestorlek - 265 + 280 Customizations Anpassningar - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Skriv direkt med JavaScript-kod.<br />Exempel: <pre>console.log('min instans är fantastisk');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Skriv CSS-kod direkt. Exempel:<br /> - <pre> - body - background-color: red; - - </pre> - - Lägg till <em>#custom-css</em> först för att åsidosätta stilmallen. Exempel: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1714,21 +1661,21 @@ Advanced configuration Avancerade inställningar - 207 + 212 Update configuration Uppdatera inställningar - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Det verkar som att konfigurationen inte stämmer. Sök efter eventuella fel i de olika flikarna. - 326 + 341 @@ -2015,11 +1962,25 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a 133 + + User's email must be verified to login + Användarens e-post måste verifieras innan inloggning + + 72 + + + + User's email is verified / User can login without email verification + Användarens e-post har verifierats / Användaren behöver inte verifiera sin e-post för att logga in + + 76 + + Ban reason: Blockeringsanledning: - 92 + 95 @@ -2086,7 +2047,7 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Actions Åtgärder - 33 + 35 @@ -2121,14 +2082,14 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Date Datum - 10 + 11 Blacklist reason: Anledning för svartlistning: - 41 + 43 @@ -2153,12 +2114,16 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a - Muted accountsMuted accounts + Muted accounts + Ignorerade konton + 2 - Muted serversMuted servers + Muted servers + Ignorerade servrar + 11 @@ -2170,74 +2135,17 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a - Muted at Muted at + Muted at + Ignorerad på + 13 - UnmuteUnmute - 23 - - - - My settings - Mina inställningar - - 3 - - - - My library - Mitt bibliotek - - 7 - - - - My channels - Mina kanaler - - 12 - - - - My videos - Mina videor - - 14 - - - - My subscriptions - Mina prenumerationer - - 16 - - - - My imports - Mina importeringar + Unmute + Sluta ignorera - 18 - - - - Misc - Diverse - - 24 - - - - Muted instancesMuted instances - 2 - - - - Ownership changes - Ändringar av ägarskap - - 33 + 23 @@ -2251,21 +2159,21 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Profile Profil - 8 + 7 Video settings Videoinställningar - 15 + 16 Danger zone Riskzon - 18 + 19 @@ -2293,13 +2201,6 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a 35 - - Submit - Skicka - - 24 - - - views - visningar @@ -2459,6 +2360,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 47 + + Muted instances + Ignorerade instanser + + 2 + + Change password Ändra lösenord @@ -2664,6 +2572,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 159 + + Sorry, but something went wrong + Någonting har tyvärr gått fel + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2700,14 +2615,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Publish will be available when upload is finished Du kan publicera när uppladdningen är klar - 53 + 58 Publish Publisera - 60 + 65 @@ -2890,14 +2805,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Wait transcoding before publishing the video Publicera video när omkodningen är avklarad - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Om du väljer att inte vänta på omkodningen innan publicering, kommer videon inte gå att spela förrän omkodningen är färdig. - 131 + 132 @@ -2911,49 +2826,49 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Add another caption Lägg till ännu en text - 146 + 147 See the subtitle file Se undertextfilen - 155 + 156 Already uploaded ✔ Redan uppladdad ✔ - 159 + 160 Will be created on update Kommer skapas vid uppdatering - 167 + 168 Cancel create Avbryt skapande - 169 + 170 Will be deleted on update Kommer raderas vid uppdatering - 175 + 176 Cancel deletion Avbryt radering - 177 + 178 @@ -2964,28 +2879,28 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Inga undertexter för tillfället. - 182 + 183 Captions Texter - 139 + 140 Upload thumbnail Ladda upp miniatyrbild - 195 + 196 Upload preview Ladda upp förhandsvisning - 202 + 203 @@ -2999,14 +2914,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Short text to tell people how they can support you (membership platform...). Kort text för att berätta hur andra kan stödja dig (medlemsplattform …). - 209 + 210 Advanced settings Avancerade inställningar - 190 + 191 @@ -3073,17 +2988,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 3 - - - Cancel - - - Avbryt - - - 19 - - Share Dela @@ -3309,7 +3213,7 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. - den här videons delningssystem medför att en del teknisk information om ditt system (såsom publik IP-adress) kan skickas till andra serventer. + den här videons delningssystem gör att en del teknisk information om ditt system (som publik IP-adress) kan skickas till andra serventer. 209 @@ -3470,13 +3374,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 14 - - Error getting about from server - Kan inte hämta information om instansen från servern - - 1 - - No description Ingen beskrivning @@ -3498,13 +3395,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Error - Fel - - 1 - - 240p 240p @@ -3547,13 +3437,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Success - Åtgärden lyckades - - 1 - - Configuration updated. Konfigurering uppdaterad. @@ -3716,12 +3599,16 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt - Account unmuted by your instance.Account unmuted by your instance. + Account unmuted by your instance. + Kontot ignoreras inte längre av din instans. + 1 - Instance unmuted by your instance.Instance unmuted by your instance. + Instance unmuted by your instance. + Instansen ignoreras inte längre av din instans. + 1 @@ -3816,6 +3703,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Set Email as Verified + Markera e-post som verifierad + + 1 + + You cannot ban root. Du kan inte blockera root. @@ -3858,13 +3752,24 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + users email set as verified. + användares e-post har markerats som verifierade. + + 1 + + - Account unmuted.Account unmuted. + Account unmuted. + Kontot ignoreras inte längre. + 1 - Instance unmuted.Instance unmuted. + Instance unmuted. + Instansen ignoreras inte längre. + 1 @@ -3966,23 +3871,16 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Vill du verkligen radera ? Det kommer radera samtliga videor som laddats upp till kanalen. - - 1 - - - - Please type the name of the video channel to confirm - Fyll i kanalens namn för att bekräfta + + Video channel deleted. + Kanalen har raderats. 1 - - Video channel deleted. - Kanalen har raderats. + + My videos + Mina videor 1 @@ -4057,16 +3955,44 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Channels - Kanaler + + My library + Mitt bibliotek + + 1 + + + + My channels + Mina kanaler 1 - - Video imports - Videoimporteringar + + My subscriptions + Mina prenumerationer + + 1 + + + + Misc + Diverse + + 1 + + + + Ownership changes + Ändringar av ägarskap + + 1 + + + + My settings + Mina inställningar 1 @@ -4192,6 +4118,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Error + Fel + + 1 + + You need to reconnect. Du måste återansluta. @@ -4213,6 +4146,20 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Info + Information + + 1 + + + + Success + Åtgärden lyckades + + 1 + + Incorrect username or password. Felaktigt användarnamn eller lösenord. @@ -4430,6 +4377,20 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Email is required. + E-postadress måste uppges. + + 1 + + + + Email must be valid. + E-postadressen måste vara giltig. + + 1 + + Username is required. Användarnamn måste fyllas i. @@ -4451,41 +4412,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Username must be at least 3 characters long. - Användarnamnet måste innehålla minst tre tecken. - - 1 - - - - Username cannot be more than 20 characters long. - Användarnamnet får inte vara mer än 20 tecken långt. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Användarnamnet får endast bestå av små bokstäver och siffror. - - 1 - - - - Email is required. - E-postadress måste uppges. - - 1 - - - - Email must be valid. - E-postadressen måste vara giltig. - - 1 - - Password must be at least 6 characters long. Lösenordet måste innehålla minst sex tecken. @@ -4549,20 +4475,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Display name must be at least 3 characters long. - Visningsnamnet måste innehålla minst tre tecken. - - 1 - - - - Display name cannot be more than 120 characters long. - Visningsnamnet får inte vara mer än 120 tecken långt. - - 1 - - Description must be at least 3 characters long. Beskrivningen måste innehålla minst tre tecken. @@ -4612,13 +4524,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Report reason cannot be more than 300 characters long. - Orsak för rapportering får inte vara mer än 300 tecken lång. - - 1 - - Moderation comment is required. Moderationskommentar krävs. @@ -4633,13 +4538,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Moderation comment cannot be more than 300 characters long. - Moderationskommentaren får inte vara mer än 300 tecken lång. - - 1 - - The channel is required. Kanalen måste anges. @@ -4696,27 +4594,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Name must be at least 3 characters long. - Namnet måste innehålla minst tre tecken. - - 1 - - - - Name cannot be more than 20 characters long. - Namnet får inte vara mer än 20 tecken långt. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Namnet kan endast bestå av små bokstäver och siffror - - 1 - - Support text must be at least 3 characters long. Supporttexten måste innehålla minst tre tecken. @@ -5396,73 +5273,108 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + User email set as verified + Användaren s e-post har markerats som verifierad. + + 1 + + - Account muted.Account muted. + Account muted. + Kontot ignoreras. + 1 - Instance muted.Instance muted. + Instance muted. + Instansen ignoreras. + 1 - Account muted by the instance.Account muted by the instance. + Account muted by the instance. + Kontot ignoreras av instansen. + 1 - Account unmuted by the instance.Account unmuted by the instance. + Account unmuted by the instance. + Kontot ignoreras inte längre av instansen. + 1 - Instance muted by the instance.Instance muted by the instance. + Instance muted by the instance. + Instansen ignoreras av instansen. + 1 - Instance unmuted by the instance.Instance unmuted by the instance. + Instance unmuted by the instance. + Instansen ignoreras inte längre av instansen. + 1 - Mute this accountMute this account + Mute this account + Ignorera det här kontot + 1 - Unmute this accountUnmute this account + Unmute this account + Sluta ignorera det här kontot + 1 - Mute the instanceMute the instance + Mute the instance + Ignorera instansen + 1 - Unmute the instanceUnmute the instance + Unmute the instance + Sluta ignorera instansen + 1 - Mute this account by your instanceMute this account by your instance + Mute this account by your instance + Ignorera det här kontot av din instans + 1 - Unmute this account by your instanceUnmute this account by your instance + Unmute this account by your instance + Sluta ignorera det här kontot av din instans + 1 - Mute the instance by your instanceMute the instance by your instance + Mute the instance by your instance + Ignorera instansen av din instans + 1 - Unmute the instance by your instanceUnmute the instance by your instance + Unmute the instance by your instance + Sluta ignorera instansen av din instans + 1 @@ -5494,13 +5406,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Subscribed - Prenumererar - - 1 - - Subscribed to Prenumererar på @@ -5508,9 +5413,9 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Unsubscribed - Prenumeration avbruten + + Subscribed + Prenumererar 1 @@ -5522,6 +5427,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Unsubscribed + Prenumeration avbruten + + 1 + + Moderator Moderator @@ -5592,13 +5504,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Info - Information - - 1 - - Upload cancelled Uppladdningen avbröts @@ -5606,13 +5511,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Vi ber om ursäkt, PeerTube kan tyvärr inte hantera videor större än 8GB - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Den här videon kommer överskrida din videokvot (videostorlek: , använt: , kvot: ) diff --git a/client/src/locale/target/angular_ta.xml b/client/src/locale/target/angular_ta.xml index 35385cfdb..abd878aaa 100644 --- a/client/src/locale/target/angular_ta.xml +++ b/client/src/locale/target/angular_ta.xml @@ -201,14 +201,14 @@ Password கடவுச்சொல் - 12 + 13 Login உள்நுழை - 38 + 36 @@ -257,7 +257,7 @@ Change the language மொழியை மாற்று - 88 + 86 @@ -268,28 +268,28 @@ வெளியேறு - 30 + 28 Create an account கணக்கை உருவாக்கு - 39 + 37 Recently added சமீபத்தியவை - 62 + 60 More மேலும் - 72 + 70 @@ -352,7 +352,7 @@ No results. முடிவுகள் இல்லை. - 17 + 20 @@ -394,7 +394,7 @@ Users பயணர்கள் - 144 + 105 @@ -408,7 +408,7 @@ Your Twitter username உங்கள் Twitter பயணர்பெயர் - 181 + 184 @@ -422,7 +422,7 @@ JavaScript JavaScript - 278 + 294 diff --git a/client/src/locale/target/angular_zh_Hans_CN.xml b/client/src/locale/target/angular_zh_Hans_CN.xml index c8ed702f8..09ed78392 100644 --- a/client/src/locale/target/angular_zh_Hans_CN.xml +++ b/client/src/locale/target/angular_zh_Hans_CN.xml @@ -499,7 +499,7 @@ Password 密码 - 12 + 13 @@ -513,7 +513,7 @@ Login 登录 - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password 发送密码重置邮件 - 75 + 80 @@ -610,7 +610,7 @@ Signup 注册 - 88 + 78 @@ -680,7 +680,7 @@ Change the language 更改语言 - 88 + 86 @@ -691,7 +691,7 @@ 我的公开个人资料 - 18 + 16 @@ -702,7 +702,7 @@ 我的帐户 - 22 + 20 @@ -713,7 +713,7 @@ 我的视频 - 26 + 24 @@ -724,14 +724,14 @@ 注销 - 30 + 28 Create an account 创建帐户 - 39 + 37 @@ -745,49 +745,49 @@ Subscriptions 订阅内容 - 47 + 45 Overview 总览 - 52 + 50 Trending 时下流行 - 57 + 55 Recently added 最近添加 - 62 + 60 Local 本地 - 67 + 65 More 更多 - 72 + 70 Administration 管理 - 76 + 74 @@ -801,14 +801,14 @@ Show keyboard shortcuts 显示键盘快捷键 - 91 + 89 Toggle dark interface 切换夜间模式 - 94 + 92 @@ -913,14 +913,14 @@ Display unlisted and private videos 显示不公开和私享视频 - 11 + 14 No results. 没有结果。 - 17 + 20 @@ -978,15 +978,22 @@ 7 - + - About instance - + Cancel + - 关于实例 - + 取消 + - 1 + 26 + + + + Submit + 提交 + + 31 @@ -1000,47 +1007,14 @@ Terms 条款 - 44 + 39 User registration is allowed and 当前开放注册，并且 - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - 本实例为用户上传的视频提供 的基本存储空间。 - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - 本实例为用户上传的视频提供无限制的存储空间。 - - - 31 - - - - - User registration is currently not allowed. - - - 当前不开放注册。 - - - 36 + 29 @@ -1395,49 +1369,49 @@ Short description 简介 - 22 + 21 Default client route 首页默认内容 - 55 + 48 Videos Overview 视频总览 - 58 + 51 Videos Trending 时下流行的视频 - 59 + 52 Videos Recently Added 最近添加的视频 - 60 + 53 Local videos 本地视频 - 61 + 54 Policy on videos containing sensitive content 针对包含敏感内容视频的策略 - 70 + 61 @@ -1472,23 +1446,44 @@ Signup enabled 开放注册 - 93 + 84 Signup requires email verification 注册需要验证电子邮件地址 - 100 + 91 Signup limit 注册限制 + + 96 + + + + Users + 用户 105 + + User default video quota + 用户默认视频存储空间大小 + + 109 + + + + User default daily upload limit + 用户默认单日上传限额 + + 121 + + Import 导入 @@ -1500,49 +1495,28 @@ Video import with HTTP URL (i.e. YouTube) enabled 允许通过 HTTP URL（例如 YouTube）导入视频 - 120 + 141 Video import with a torrent file or a magnet URI enabled 允许通过种子文件或磁力链导入视频 - 127 + 148 Administrator 管理员 - 131 + 155 Admin email 管理员电子邮件地址 - 134 - - - - Users - 用户 - - 144 - - - - User default video quota - 用户默认视频存储空间大小 - - 147 - - - - User default daily upload limit - 用户默认单日上传限额 - - 161 + 158 @@ -1563,21 +1537,21 @@ Your Twitter username 您的 Twitter 用户名 - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. 显示此内容所在的发布平台对应的 Twitter 帐户。 - 184 + 187 Instance whitelisted by Twitter 实例已进入 Twitter 白名单 - 198 + 199 @@ -1591,35 +1565,35 @@ Transcoding 转码 - 210 + 215 Transcoding enabled 启用转码 - 215 + 221 If you disable transcoding, many videos from your users will not work! 如果禁用转码，用户上传的视频很有可能无法正常播放！ - 216 + 222 Transcoding threads 转码线程数 - 223 + 237 Resolution enabled 启用 分辨率 - 239 + 252 @@ -1634,82 +1608,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. 部分文件不会自动同步（如预览图、字幕）。我们会直接从源实例拉取并进行缓存。 - 249 + 265 Previews cache size 预览图缓存大小 - 254 + 271 Video captions cache size 视频字幕缓存大小 - 265 + 280 Customizations 自定义 - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> 在此处直接输入 JavaScript 代码。<br />示例：<pre>console.log('我的实例太棒了');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - 在此处直接输入 CSS 代码。示例：<br /> - <pre> - body - background-color: red; - - </pre> - - 您可以通过插入 <em>#custom-css</em> 来覆盖样式设置。示例： - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1718,21 +1657,21 @@ Advanced configuration 高级设置 - 207 + 212 Update configuration 更新设置 - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. 设置信息不合法。请检查各选项卡中的设置是否存在错误。 - 326 + 341 @@ -2028,7 +1967,7 @@ Ban reason: 封禁理由： - 92 + 95 @@ -2095,7 +2034,7 @@ Actions 操作 - 33 + 35 @@ -2130,14 +2069,14 @@ Date 日期 - 10 + 11 Blacklist reason: 黑名单理由： - 41 + 43 @@ -2196,69 +2135,6 @@ 23 - - My settings - 我的设置 - - 3 - - - - My library - 我的库 - - 7 - - - - My channels - 我的频道 - - 12 - - - - My videos - 我的视频 - - 14 - - - - My subscriptions - 我的订阅 - - 16 - - - - My imports - 我的导入 - - 18 - - - - Misc - 杂项 - - 24 - - - - Muted instances - 已屏蔽的实例 - - 2 - - - - Ownership changes - 视频转移 - - 33 - - Video quota: 视频存储空间： @@ -2270,21 +2146,21 @@ Profile 个人资料 - 8 + 7 Video settings 视频设置 - 15 + 16 Danger zone 危险选项 - 18 + 19 @@ -2312,13 +2188,6 @@ 35 - - Submit - 提交 - - 24 - - - views - 次观看 @@ -2478,6 +2347,13 @@ When you will upload a video in this channel, the video support field will be au 47 + + Muted instances + 已屏蔽的实例 + + 2 + + Change password 更改密码 @@ -2719,14 +2595,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished 上传完毕后即可发布 - 53 + 58 Publish 发布 - 60 + 65 @@ -2909,14 +2785,14 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video 等待转码完毕后再发布视频 - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. 如果您选择不等待转码就发布视频，则视频在转码完毕前很有可能无法正常播放。 - 131 + 132 @@ -2930,49 +2806,49 @@ When you will upload a video in this channel, the video support field will be au Add another caption 添加字幕 - 146 + 147 See the subtitle file 查看字幕文件 - 155 + 156 Already uploaded ✔ 已上传 ✔ - 159 + 160 Will be created on update 将在更新时创建 - 167 + 168 Cancel create 取消创建 - 169 + 170 Will be deleted on update 将在更新时删除 - 175 + 176 Cancel deletion 取消删除 - 177 + 178 @@ -2983,28 +2859,28 @@ When you will upload a video in this channel, the video support field will be au 当前没有字幕。 - 182 + 183 Captions 字幕 - 139 + 140 Upload thumbnail 上传缩略图 - 195 + 196 Upload preview 上传预览图 - 202 + 203 @@ -3018,14 +2894,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). 用一段简短的文字告知观众支持您的频道的方法（赞助社区等）。 - 209 + 210 Advanced settings 高级设置 - 190 + 191 @@ -3092,17 +2968,6 @@ When you will upload a video in this channel, the video support field will be au 3 - - - Cancel - - - 取消 - - - 19 - - Share 分享 @@ -3488,13 +3353,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - 从服务器获取关于信息时发生错误 - - 1 - - No description 没有说明 @@ -3516,13 +3374,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - 错误 - - 1 - - 240p 240p @@ -3565,13 +3416,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Success - 成功 - - 1 - - Configuration updated. 设置已更新。 @@ -3993,23 +3837,16 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - 您确定要删除 吗？这将同时删除上传至该频道的所有视频。 - - 1 - - - - Please type the name of the video channel to confirm - 输入视频频道的显示名以确认操作 + + Video channel deleted. + 视频频道 已删除。 1 - - Video channel deleted. - 视频频道 已删除。 + + My videos + 我的视频 1 @@ -4084,16 +3921,44 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels - 频道 + + My library + 我的库 1 - - Video imports - 导入的视频 + + My channels + 我的频道 + + 1 + + + + My subscriptions + 我的订阅 + + 1 + + + + Misc + 杂项 + + 1 + + + + Ownership changes + 视频转移 + + 1 + + + + My settings + 我的设置 1 @@ -4219,6 +4084,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + 错误 + + 1 + + You need to reconnect. 请重新进行授权。 @@ -4240,6 +4112,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + 提示 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. 用户名或密码不正确。 @@ -4457,6 +4343,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + 请输入电子邮件地址。 + + 1 + + + + Email must be valid. + 请输入合法的电子邮件地址。 + + 1 + + Username is required. 请输入用户名。 @@ -4478,41 +4378,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - 用户名应至少 3 个字符。 - - 1 - - - - Username cannot be more than 20 characters long. - 用户名不能超过 20 个字符。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - 用户名只能使用小写字母和数字。 - - 1 - - - - Email is required. - 请输入电子邮件地址。 - - 1 - - - - Email must be valid. - 请输入合法的电子邮件地址。 - - 1 - - Password must be at least 6 characters long. 密码应至少 6 个字符。 @@ -4576,20 +4441,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - 显示名称应至少 3 个字符。 - - 1 - - - - Display name cannot be more than 120 characters long. - 显示名称不能超过 120 个字符。 - - 1 - - Description must be at least 3 characters long. 说明应至少 3 个字符。 @@ -4639,13 +4490,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - 举报理由不能超过 300 个字符。 - - 1 - - Moderation comment is required. 请输入运营备注信息。 @@ -4660,13 +4504,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. - 运营备注信息不能超过 300 个字符。 - - 1 - - The channel is required. 必须指定频道。 @@ -4723,27 +4560,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - 频道用户名应至少 3 个字符。 - - 1 - - - - Name cannot be more than 20 characters long. - 频道用户名不能超过 20 个字符。 - - 1 - - - - Name should be only lowercase alphanumeric characters. - 频道用户名只能使用小写字母和数字。 - - 1 - - Support text must be at least 3 characters long. 支持信息应至少 3 个字符。 @@ -5549,13 +5365,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed - 已订阅 - - 1 - - Subscribed to 成功订阅 @@ -5563,9 +5372,9 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unsubscribed - 已退订 + + Subscribed + 已订阅 1 @@ -5577,6 +5386,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unsubscribed + 已退订 + + 1 + + Moderator 监察员 @@ -5633,13 +5449,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - 提示 - - 1 - - Upload cancelled 上传已取消 @@ -5647,13 +5456,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 非常抱歉，PeerTube 不支持 8GB 以上的视频 - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) 此视频已超出您的视频存储总空间（视频大小：，当前已使用：，总空间：） diff --git a/client/src/locale/target/angular_zh_Hant_TW.xml b/client/src/locale/target/angular_zh_Hant_TW.xml index 028520a6e..c1aefbb40 100644 --- a/client/src/locale/target/angular_zh_Hant_TW.xml +++ b/client/src/locale/target/angular_zh_Hant_TW.xml @@ -497,7 +497,7 @@ Password 密碼 - 12 + 13 @@ -511,7 +511,7 @@ Login 登入 - 38 + 36 @@ -539,7 +539,7 @@ Send me an email to reset my password 傳送電子郵件給我以重設我的密碼 - 75 + 80 @@ -606,7 +606,7 @@ Signup 註冊 - 88 + 78 @@ -674,7 +674,7 @@ Change the language 變更語言 - 88 + 86 @@ -685,7 +685,7 @@ 我的公開個人資料 - 18 + 16 @@ -696,7 +696,7 @@ 我的帳號 - 22 + 20 @@ -707,7 +707,7 @@ 我的影片 - 26 + 24 @@ -718,14 +718,14 @@ 登出 - 30 + 28 Create an account 建立帳號 - 39 + 37 @@ -739,49 +739,49 @@ Subscriptions 訂閱 - 47 + 45 Overview 概覽 - 52 + 50 Trending 趨勢 - 57 + 55 Recently added 最近新增 - 62 + 60 Local 本地 - 67 + 65 More 更多 - 72 + 70 Administration 管理 - 76 + 74 @@ -795,14 +795,14 @@ Show keyboard shortcuts 顯示鍵盤快捷鍵 - 91 + 89 Toggle dark interface 切換至暗色介面 - 94 + 92 @@ -907,14 +907,14 @@ Display unlisted and private videos 顯示未列出與私密影片 - 11 + 14 No results. 沒有結果 - 17 + 20 @@ -972,13 +972,22 @@ 7 - + - About instance - - 關於 實體 + Cancel + + + 取消 + - 1 + 26 + + + + Submit + 遞交 + + 31 @@ -992,41 +1001,14 @@ Terms 條款 - 44 + 39 User registration is allowed and 允許使用者註冊與 - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - 此實體提供了基本配額 空間給它的使用者的影片。 - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - 此實體提供了無限的影片空間給它的使用者。 - - 31 - - - - - User registration is currently not allowed. - - 目前不允許使用者註冊。 - - 36 + 29 @@ -1353,49 +1335,49 @@ Short description 短描述 - 22 + 21 Default client route 預設客戶端路由 - 55 + 48 Videos Overview 影片概覽 - 58 + 51 Videos Trending 影片趨勢 - 59 + 52 Videos Recently Added 最近新增的影片 - 60 + 53 Local videos 本地影片 - 61 + 54 Policy on videos containing sensitive content 包含敏感內容的影片政策 - 70 + 61 @@ -1430,23 +1412,44 @@ Signup enabled 已啟用註冊 - 93 + 84 Signup requires email verification 註冊需要電子郵件驗證 - 100 + 91 Signup limit 限制註冊 + + 96 + + + + Users + 使用者 105 + + User default video quota + 使用者預設影片配額 + + 109 + + + + User default daily upload limit + 預設使用者每日上傳限制 + + 121 + + Import 匯入 @@ -1458,49 +1461,28 @@ Video import with HTTP URL (i.e. YouTube) enabled 以 HTTP URL 匯入影片（如 YouTube）已啟用 - 120 + 141 Video import with a torrent file or a magnet URI enabled 已啟用種子檔案或磁力連結匯入影片 - 127 + 148 Administrator 管理員 - 131 + 155 Admin email 管理電子郵件 - 134 - - - - Users - 使用者 - - 144 - - - - User default video quota - 使用者預設影片配額 - - 147 - - - - User default daily upload limit - 預設使用者每日上傳限制 - - 161 + 158 @@ -1521,30 +1503,19 @@ Your Twitter username 您的 Twitter 使用者名稱 - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. 指示發佈影片的網頁或平臺的 Twitter 帳號 - 184 + 187 Instance whitelisted by Twitter 由 Twitter 列入白名單的實體 - - 198 - - - - If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> - Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. - 如果您的實體在 Twitter 的白名單裡面，PeerTube 的影片分享將會在 Twitter 的推文中嵌入影片播放器。<br /> - 如果實體不在白名單中，我們會使用一張圖片連結卡片並重新導向至您的 PeerTube 實體。<br /><br /> - 在此勾選框打勾，儲存設定並使用您實體的影片 URL (https://example.com/videos/watch/blabla)在 <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> 上測試以檢視您的實體是否在白名單內。 199 @@ -1560,35 +1531,35 @@ Transcoding 轉換編碼 - 210 + 215 Transcoding enabled 轉換編碼已啟用 - 215 + 221 If you disable transcoding, many videos from your users will not work! 若您停用轉換編碼，從您的使用者們而來的許多影片將會無法運作！ - 216 + 222 Transcoding threads 轉換編碼執行緒 - 223 + 237 Resolution enabled 解析度 已啟用 - 239 + 252 @@ -1603,82 +1574,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. 有一些檔案並未聯盟化（預覽、字幕）。我們會直接從原始實體擷取它們並快取。 - 249 + 265 Previews cache size 預覽快取大小 - 254 + 271 Video captions cache size 影片字幕快取大小 - 265 + 280 Customizations 自訂 - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> 直接編寫 JavaScript 程式碼。<br />範例：<pre>console.log('my instance is amazing');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - 直接撰寫 CSS 程式碼。範例：<br /> - <pre> - body - background-color: red; - - </pre> - - 附加 <em>#custom-css</em> 以覆寫樣式。範例： - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1687,21 +1623,21 @@ Advanced configuration 進階設定 - 207 + 212 Update configuration 更新設定 - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. 設定似乎無效。請在不同的分頁中搜尋潛在的錯誤。 - 326 + 341 @@ -1987,21 +1923,21 @@ User's email must be verified to login 使用者的電子郵件必須驗證過才能登入 - 70 + 72 User's email is verified / User can login without email verification 使用者的電子郵件已驗證／使用者可以不透過電子郵件驗證登入 - 74 + 76 Ban reason: 阻擋理由： - 92 + 95 @@ -2068,7 +2004,7 @@ Actions 動作 - 33 + 35 @@ -2103,14 +2039,14 @@ Date 日期 - 10 + 11 Blacklist reason: 黑名單理由： - 41 + 43 @@ -2169,69 +2105,6 @@ 23 - - My settings - 我的設定 - - 3 - - - - My library - 我的媒體庫 - - 7 - - - - My channels - 我的頻道 - - 12 - - - - My videos - 我的影片 - - 14 - - - - My subscriptions - 我的訂閱 - - 16 - - - - My imports - 我的匯入 - - 18 - - - - Misc - 雜項 - - 24 - - - - Muted instances - 已靜音的實體 - - 2 - - - - Ownership changes - 所有權變更 - - 33 - - Video quota: 影片配額： @@ -2243,21 +2116,21 @@ Profile 簡介 - 8 + 7 Video settings 影片設定 - 15 + 16 Danger zone 危險區域 - 18 + 19 @@ -2285,13 +2158,6 @@ 35 - - Submit - 遞交 - - 24 - - - views - 次檢視 @@ -2450,6 +2316,13 @@ When you will upload a video in this channel, the video support field will be au 47 + + Muted instances + 已靜音的實體 + + 2 + + Change password 變更密碼 @@ -2694,14 +2567,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished 上傳完成時將可發佈 - 53 + 58 Publish 發佈 - 60 + 65 @@ -2882,14 +2755,14 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video 正等待發佈影片前的轉換編碼 - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. 如果您決定不要等待在發佈影片前的轉換編碼，它可能會在轉換編碼結束前都無法播放。 - 131 + 132 @@ -2903,49 +2776,49 @@ When you will upload a video in this channel, the video support field will be au Add another caption 新增其他字幕 - 146 + 147 See the subtitle file 檢視字幕檔案 - 155 + 156 Already uploaded ✔ 已上傳 ✔ - 159 + 160 Will be created on update 將在更新時建立 - 167 + 168 Cancel create 取消建立 - 169 + 170 Will be deleted on update 將在更新時刪除 - 175 + 176 Cancel deletion 取消刪除 - 177 + 178 @@ -2956,28 +2829,28 @@ When you will upload a video in this channel, the video support field will be au 現在沒有字幕。 - 182 + 183 Captions 字幕 - 139 + 140 Upload thumbnail 上傳縮圖 - 195 + 196 Upload preview 上傳預覽 - 202 + 203 @@ -2991,14 +2864,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). 告訴人們他們可以如何支援您（成員平臺等）的短文 - 209 + 210 Advanced settings 進階設定 - 190 + 191 @@ -3065,17 +2938,6 @@ When you will upload a video in this channel, the video support field will be au 3 - - - Cancel - - - 取消 - - - 19 - - Share 分享 @@ -3460,13 +3322,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - 取得關於伺服器的錯誤 - - 1 - - No description 沒有描述 @@ -3488,13 +3343,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - 錯誤 - - 1 - - 240p 240p @@ -3537,13 +3385,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Success - 成功 - - 1 - - Configuration updated. 設定已更新。 @@ -3978,23 +3819,16 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - 您真的想要刪除 嗎？這也會刪除所有上傳到這個頻道的影片。 - - 1 - - - - Please type the name of the video channel to confirm - 請輸入影片頻道的名稱以確認 + + Video channel deleted. + 影片頻道 已刪除。 1 - - Video channel deleted. - 影片頻道 已刪除。 + + My videos + 我的影片 1 @@ -4069,16 +3903,44 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels - 頻道 + + My library + 我的媒體庫 1 - - Video imports - 影片匯入 + + My channels + 我的頻道 + + 1 + + + + My subscriptions + 我的訂閱 + + 1 + + + + Misc + 雜項 + + 1 + + + + Ownership changes + 所有權變更 + + 1 + + + + My settings + 我的設定 1 @@ -4204,6 +4066,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + 錯誤 + + 1 + + You need to reconnect. 您需要重新連線。 @@ -4225,6 +4094,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + 資訊 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. 不正確的使用者名稱或密碼。 @@ -4442,6 +4325,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + 電子郵件必填。 + + 1 + + + + Email must be valid. + 電子郵件必須為有效電子郵件。 + + 1 + + Username is required. 使用者名稱必填。 @@ -4463,41 +4360,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - 使用者名稱必須至少 3 個字元長。 - - 1 - - - - Username cannot be more than 20 characters long. - 使用者名稱不能多於 20 個字元。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - 使用者名稱應該僅有小寫英數字元。 - - 1 - - - - Email is required. - 電子郵件必填。 - - 1 - - - - Email must be valid. - 電子郵件必須為有效電子郵件。 - - 1 - - Password must be at least 6 characters long. 密碼必須至少 6 個字元長。 @@ -4561,20 +4423,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - 顯示名稱必須至少 3 個字元長。 - - 1 - - - - Display name cannot be more than 120 characters long. - 顯示名稱不能多於 120 個字元。 - - 1 - - Description must be at least 3 characters long. 描述必須至少 3 個字元長。 @@ -4624,13 +4472,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - 回報理由不能多於 300 個字元。 - - 1 - - Moderation comment is required. 管理評論必填。 @@ -4645,13 +4486,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. - 管理評論無法多於 300 個字元。 - - 1 - - The channel is required. 頻道必填。 @@ -4708,27 +4542,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - 名稱必須至少 3 個字元。 - - 1 - - - - Name cannot be more than 20 characters long. - 名稱不能超過 20 個字元。 - - 1 - - - - Name should be only lowercase alphanumeric characters. - 名稱應該只有小寫英數字元。 - - 1 - - Support text must be at least 3 characters long. 支援文字必須至少 3 個字元長。 @@ -5541,13 +5354,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed - 已訂閱 - - 1 - - Subscribed to 訂閱 @@ -5555,9 +5361,9 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unsubscribed - 已取消訂閱 + + Subscribed + 已訂閱 1 @@ -5569,6 +5375,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unsubscribed + 已取消訂閱 + + 1 + + Moderator 主持人 @@ -5639,13 +5452,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - 資訊 - - 1 - - Upload cancelled 已取消上傳 @@ -5653,13 +5459,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 我們很抱歉，但 PeerTube 無法處理大於 8GB 的影片 - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) 您的影片配額已因此影片超過（影片大小：, used: ，配額：） diff --git a/client/src/locale/target/iso639_nl_NL.xml b/client/src/locale/target/iso639_nl_NL.xml index 9c0e2fd9e..b3a4ff541 100644 --- a/client/src/locale/target/iso639_nl_NL.xml +++ b/client/src/locale/target/iso639_nl_NL.xml @@ -5,7 +5,7 @@ Afar - Afar + Ver Abkhazian @@ -43,6 +43,10 @@ Avaric Avaars + + Kotava + Kotava + Aymara Aymara @@ -167,6 +171,10 @@ English Engels + + Esperanto + Esperanto + Estonian Ests @@ -311,6 +319,10 @@ Javanese Javaans + + Lojban + Lojban + Japanese Japans @@ -495,6 +507,10 @@ Nyanja Nyanja + + Occitan + Occitan + Ojibwa Ojibwe @@ -671,6 +687,10 @@ Tigrinya Tigrinya + + Klingon + Klingon + Tonga (Tonga Islands) Tongaans diff --git a/client/src/locale/target/player_nl_NL.xml b/client/src/locale/target/player_nl_NL.xml index 5b689f2a2..45bc76a55 100644 --- a/client/src/locale/target/player_nl_NL.xml +++ b/client/src/locale/target/player_nl_NL.xml @@ -347,6 +347,10 @@ Speed Snelheid + + Subtitles/CC + Ondertiteling/CC + peers peers diff --git a/client/src/locale/target/server_cs_CZ.json b/client/src/locale/target/server_cs_CZ.json index 060658c80..e013a910f 100644 --- a/client/src/locale/target/server_cs_CZ.json +++ b/client/src/locale/target/server_cs_CZ.json @@ -1 +1 @@ -{"Music":"Hudba","Films":"Filmy","Vehicles":"Auta","Art":"Umění","Sports":"Sport","Travels":"Cestování","Gaming":"Hry","People":"Lidé","Comedy":"Komedie","Entertainment":"Zábava","News & Politics":"Zprávy a politika","How To":"Jak na to","Education":"Výukové","Activism":"Aktivismus","Science & Technology":"Věda a technologie","Animals":"Zvířata","Kids":"Děti","Food":"Jídlo a vaření","Attribution":"Uveďte autora","Attribution - Share Alike":"Uveďte autora - Zachovejte licenci","Attribution - No Derivatives":"Uveďte autora - Nezpracovávejte","Attribution - Non Commercial":"Uveďte autora - Nešiřte dílo komerčně","Attribution - Non Commercial - Share Alike":"Uveďte autora - Nešiřte dílo komerčně - Zachovejte licenci","Attribution - Non Commercial - No Derivatives":"Uveďte autora - Nešiřte dílo komerčně - Nezpracovávejte","Public Domain Dedication":"Volné dílo","Public":"Veřejné","Unlisted":"Nezobrazeno","Private":"Soukromé","Published":"Publikované","Pending":"Čekající","Success":"Úspěch","Failed":"Neúspěch","Misc":"Různé","Unknown":"Neznámé","Afar":"Afarština","Abkhazian":"Abcházština","Afrikaans":"Afrikánština","Akan":"Akanština","Amharic":"Amharština","Arabic":"Arabština","Aragonese":"Aragonština","American Sign Language":"Americká znaková řeč","Assamese":"Ásámština","Avaric":"Avarština","Kotava":"Kotava","Aymara":"Ajmarština","Azerbaijani":"Ázerbájdžánština","Bashkir":"Baškirština","Bambara":"Bambarština","Belarusian":"Běloruština","Bengali":"Bengálština","British Sign Language":"Britská znaková řeč","Bislama":"Bislamština","Tibetan":"Tibetština","Bosnian":"Bosenština","Breton":"Bretonština","Bulgarian":"Bulharština","Brazilian Sign Language":"Brazilská znaková řeč","Catalan":"Katalánština","Czech":"Čeština","Chamorro":"Chamorro","Chechen":"Čečenština","Chuvash":"Čuvaština","Cornish":"Kornština","Corsican":"Korsičtina","Cree":"Kríjština","Czech Sign Language":"Česká znaková řeč","Chinese Sign Language":"Čínská znaková řeč","Welsh":"Velština","Danish":"Dánština","German":"Němčina","Dhivehi":"Maledivština","Danish Sign Language":"Dánská znaková řeč","Dzongkha":"Dzongkä","Modern Greek (1453-)":"Moderní řečtina","English":"Angličtina","Esperanto":"Esperanto","Estonian":"Estonština","Basque":"Baskičtina","Ewe":"Eveština","Faroese":"Faerština","Persian":"Perština","Fijian":"Fidžijština","Finnish":"Finština","French":"Francouzština","Western Frisian":"Západofríština","French Sign Language":"Francouzská znaková řeč","Fulah":"Fulbština","Scottish Gaelic":"Skotská gaelština","Irish":"Irština","Galician":"Galicijština","Manx":"Manština","Guarani":"Guaranština","German Sign Language":"Německá znaková řeč","Gujarati":"Gudžarátština","Haitian":"Haitská kreolština","Hausa":"Hauština","Serbo-Croatian":"Srcbochorvatšinta","Hebrew":"Hebrejština","Herero":"Herero","Hindi":"Hindština","Hiri Motu":"Hiri Motu","Croatian":"Chorvatština","Hungarian":"Maďarština","Armenian":"Arménština","Igbo":"Igboština","Sichuan Yi":"Nuosu","Inuktitut":"Inuktitutština","Indonesian":"Indonéština","Inupiaq":"Inupiaq","Icelandic":"Islandština","Italian":"Italština","Javanese":"Javánština","Lojban":"Lojban","Japanese":"Japonština","Japanese Sign Language":"Japonská znaková řeč","Kalaallisut":"Grónština","Kannada":"Kannadština","Kashmiri":"Kašmírština","Georgian":"Gruzínština","Kanuri":"Kanurijština","Kazakh":"Kazaština","Khmer":"Khmerština","Kikuyu":"Kikujština","Kinyarwanda":"Rwandština","Kirghiz":"Kyrgyzština","Komi":"Komi","Kongo":"Konžština","Korean":"Korejština","Kuanyama":"Kuanyama","Kurdish":"Kurdština","Lao":"Laoština","Latvian":"Lotyština","Limburgan":"Limburština","Lingala":"Ngalština","Lithuanian":"Litevština","Luxembourgish":"Lucemburština","Luba-Katanga":"Luba-Katanga","Ganda":"Gandština","Marshallese":"Maršálština","Malayalam":"Malajálamština","Marathi":"Maráthština","Macedonian":"Makedonština","Malagasy":"Malgaština","Maltese":"Maltština","Mongolian":"Mongolština","Maori":"Maorština","Malay (macrolanguage)":"Malajština","Burmese":"Barmština","Nauru":"Naurština","Navajo":"Navažština","South Ndebele":"Jižní ndebelština","North Ndebele":"Severní ndebelština","Ndonga":"Ndondština","Nepali (macrolanguage)":"Nepálština","Dutch":"Dánština","Norwegian Nynorsk":"Norština Nynorsk","Norwegian Bokmål":"Norština Bokmål","Norwegian":"Norština ","Nyanja":"Čičevština","Occitan":"Okcitánština","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Urijština","Oromo":"Oromština","Ossetian":"Osetština","Panjabi":"Paňdžábština","Pakistan Sign Language":"Pakistánská znaková řeč","Polish":"Polština","Portuguese":"Portugalština","Pushto":"Paštština","Quechua":"Kečuánština","Romansh":"Rétorománština","Romanian":"Rumunština","Russian Sign Language":"Ruská znaková řeč","Rundi":"Kirundi","Russian":"Ruština","Sango":"Sango","Saudi Arabian Sign Language":"Saudská arabská znaková řeč","South African Sign Language":"Jihoafrická znaková řeč","Sinhala":"Sinhálština","Slovak":"Slovenština","Slovenian":"Slovinština","Northern Sami":"Severní sámština","Samoan":"Samojština","Shona":"Shona","Sindhi":"Sindhština","Somali":"Somálština","Southern Sotho":"Jižní sotština","Spanish":"Španělština","Albanian":"Albánština","Sardinian":"Sardínština","Serbian":"Srbština","Swati":"Swati","Sundanese":"Sundština","Swahili (macrolanguage)":"Svahilština","Swedish":"Švédština","Swedish Sign Language":"Švédská znaková řeč","Tahitian":"Tahitština","Tamil":"Tamilština","Tatar":"Tatarština","Telugu":"Telugština","Tajik":"Tádžičtina","Tagalog":"Tagalog","Thai":"Thajština","Tigrinya":"Tigrinya","Klingon":"Klingonština","Tonga (Tonga Islands)":"Tongánština","Tswana":"Setswanština","Tsonga":"Tsongština","Turkmen":"Turkmenština","Turkish":"Turečtina","Twi":"Twi","Uighur":"Ujgurština","Ukrainian":"Ukrajinština","Urdu":"Urdština","Uzbek":"Uzbečtina","Venda":"Vendština","Vietnamese":"Vietnamština","Walloon":"Valonština","Wolof":"Wolof ","Xhosa":"Xhoština","Yiddish":"Jidiš","Yoruba":"Jorubština","Zhuang":"Čuangština","Chinese":"Čínština","Zulu":"Zuluština"} \ No newline at end of file +{"Music":"Hudba","Films":"Filmy","Vehicles":"Auta","Art":"Umění","Sports":"Sport","Travels":"Cestování","Gaming":"Hry","People":"Lidé","Comedy":"Komedie","Entertainment":"Zábava","News & Politics":"Zprávy a politika","How To":"Jak na to","Education":"Výukové","Activism":"Aktivismus","Science & Technology":"Věda a technologie","Animals":"Zvířata","Kids":"Děti","Food":"Jídlo a vaření","Attribution":"Uveďte autora","Attribution - Share Alike":"Uveďte autora - Zachovejte licenci","Attribution - No Derivatives":"Uveďte autora - Nezpracovávejte","Attribution - Non Commercial":"Uveďte autora - Nešiřte dílo komerčně","Attribution - Non Commercial - Share Alike":"Uveďte autora - Nešiřte dílo komerčně - Zachovejte licenci","Attribution - Non Commercial - No Derivatives":"Uveďte autora - Nešiřte dílo komerčně - Nezpracovávejte","Public Domain Dedication":"Volné dílo","Public":"Veřejné","Unlisted":"Nezobrazeno","Private":"Soukromé","Published":"Publikované","To transcode":"K transkódování","To import":"To import","Pending":"Čekající","Success":"Úspěch","Failed":"Neúspěch","Misc":"Různé","Unknown":"Neznámé","Afar":"Afarština","Abkhazian":"Abcházština","Afrikaans":"Afrikánština","Akan":"Akanština","Amharic":"Amharština","Arabic":"Arabština","Aragonese":"Aragonština","American Sign Language":"Americká znaková řeč","Assamese":"Ásámština","Avaric":"Avarština","Kotava":"Kotava","Aymara":"Ajmarština","Azerbaijani":"Ázerbájdžánština","Bashkir":"Baškirština","Bambara":"Bambarština","Belarusian":"Běloruština","Bengali":"Bengálština","British Sign Language":"Britská znaková řeč","Bislama":"Bislamština","Tibetan":"Tibetština","Bosnian":"Bosenština","Breton":"Bretonština","Bulgarian":"Bulharština","Brazilian Sign Language":"Brazilská znaková řeč","Catalan":"Katalánština","Czech":"Čeština","Chamorro":"Chamorro","Chechen":"Čečenština","Chuvash":"Čuvaština","Cornish":"Kornština","Corsican":"Korsičtina","Cree":"Kríjština","Czech Sign Language":"Česká znaková řeč","Chinese Sign Language":"Čínská znaková řeč","Welsh":"Velština","Danish":"Dánština","German":"Němčina","Dhivehi":"Maledivština","Danish Sign Language":"Dánská znaková řeč","Dzongkha":"Dzongkä","Modern Greek (1453-)":"Moderní řečtina","English":"Angličtina","Esperanto":"Esperanto","Estonian":"Estonština","Basque":"Baskičtina","Ewe":"Eveština","Faroese":"Faerština","Persian":"Perština","Fijian":"Fidžijština","Finnish":"Finština","French":"Francouzština","Western Frisian":"Západofríština","French Sign Language":"Francouzská znaková řeč","Fulah":"Fulbština","Scottish Gaelic":"Skotská gaelština","Irish":"Irština","Galician":"Galicijština","Manx":"Manština","Guarani":"Guaranština","German Sign Language":"Německá znaková řeč","Gujarati":"Gudžarátština","Haitian":"Haitská kreolština","Hausa":"Hauština","Serbo-Croatian":"Srcbochorvatšinta","Hebrew":"Hebrejština","Herero":"Herero","Hindi":"Hindština","Hiri Motu":"Hiri Motu","Croatian":"Chorvatština","Hungarian":"Maďarština","Armenian":"Arménština","Igbo":"Igboština","Sichuan Yi":"Nuosu","Inuktitut":"Inuktitutština","Indonesian":"Indonéština","Inupiaq":"Inupiaq","Icelandic":"Islandština","Italian":"Italština","Javanese":"Javánština","Lojban":"Lojban","Japanese":"Japonština","Japanese Sign Language":"Japonská znaková řeč","Kalaallisut":"Grónština","Kannada":"Kannadština","Kashmiri":"Kašmírština","Georgian":"Gruzínština","Kanuri":"Kanurijština","Kazakh":"Kazaština","Khmer":"Khmerština","Kikuyu":"Kikujština","Kinyarwanda":"Rwandština","Kirghiz":"Kyrgyzština","Komi":"Komi","Kongo":"Konžština","Korean":"Korejština","Kuanyama":"Kuanyama","Kurdish":"Kurdština","Lao":"Laoština","Latvian":"Lotyština","Limburgan":"Limburština","Lingala":"Ngalština","Lithuanian":"Litevština","Luxembourgish":"Lucemburština","Luba-Katanga":"Luba-Katanga","Ganda":"Gandština","Marshallese":"Maršálština","Malayalam":"Malajálamština","Marathi":"Maráthština","Macedonian":"Makedonština","Malagasy":"Malgaština","Maltese":"Maltština","Mongolian":"Mongolština","Maori":"Maorština","Malay (macrolanguage)":"Malajština","Burmese":"Barmština","Nauru":"Naurština","Navajo":"Navažština","South Ndebele":"Jižní ndebelština","North Ndebele":"Severní ndebelština","Ndonga":"Ndondština","Nepali (macrolanguage)":"Nepálština","Dutch":"Dánština","Norwegian Nynorsk":"Norština Nynorsk","Norwegian Bokmål":"Norština Bokmål","Norwegian":"Norština ","Nyanja":"Čičevština","Occitan":"Okcitánština","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Urijština","Oromo":"Oromština","Ossetian":"Osetština","Panjabi":"Paňdžábština","Pakistan Sign Language":"Pakistánská znaková řeč","Polish":"Polština","Portuguese":"Portugalština","Pushto":"Paštština","Quechua":"Kečuánština","Romansh":"Rétorománština","Romanian":"Rumunština","Russian Sign Language":"Ruská znaková řeč","Rundi":"Kirundi","Russian":"Ruština","Sango":"Sango","Saudi Arabian Sign Language":"Saudská arabská znaková řeč","South African Sign Language":"Jihoafrická znaková řeč","Sinhala":"Sinhálština","Slovak":"Slovenština","Slovenian":"Slovinština","Northern Sami":"Severní sámština","Samoan":"Samojština","Shona":"Shona","Sindhi":"Sindhština","Somali":"Somálština","Southern Sotho":"Jižní sotština","Spanish":"Španělština","Albanian":"Albánština","Sardinian":"Sardínština","Serbian":"Srbština","Swati":"Swati","Sundanese":"Sundština","Swahili (macrolanguage)":"Svahilština","Swedish":"Švédština","Swedish Sign Language":"Švédská znaková řeč","Tahitian":"Tahitština","Tamil":"Tamilština","Tatar":"Tatarština","Telugu":"Telugština","Tajik":"Tádžičtina","Tagalog":"Tagalog","Thai":"Thajština","Tigrinya":"Tigrinya","Klingon":"Klingonština","Tonga (Tonga Islands)":"Tongánština","Tswana":"Setswanština","Tsonga":"Tsongština","Turkmen":"Turkmenština","Turkish":"Turečtina","Twi":"Twi","Uighur":"Ujgurština","Ukrainian":"Ukrajinština","Urdu":"Urdština","Uzbek":"Uzbečtina","Venda":"Vendština","Vietnamese":"Vietnamština","Walloon":"Valonština","Wolof":"Wolof ","Xhosa":"Xhoština","Yiddish":"Jidiš","Yoruba":"Jorubština","Zhuang":"Čuangština","Chinese":"Čínština","Zulu":"Zuluština"} \ No newline at end of file diff --git a/client/src/locale/target/server_fr_FR.json b/client/src/locale/target/server_fr_FR.json index eebc2f96e..64762b575 100644 --- a/client/src/locale/target/server_fr_FR.json +++ b/client/src/locale/target/server_fr_FR.json @@ -1 +1 @@ -{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News & Politics":"Actualité & Politique","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d’œuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d’œuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Published":"Publiée","To transcode":"À transcoder","To import":"À importer","Pending":"En cours","Success":"Succès","Failed":"Échoué","Misc":"Divers","Unknown":"Inconnu","Afar":"Afar","Abkhazian":"Abkhaze","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharique","Arabic":"Arabe","Aragonese":"Aragonais","American Sign Language":"Langue des signes américaine","Assamese":"Assamais","Avaric":"Avar","Kotava":"Kotava","Aymara":"Aymara","Azerbaijani":"Azéri","Bashkir":"Bachkir","Bambara":"Bambara","Belarusian":"Biélorusse","Bengali":"Bengali","British Sign Language":"Langue des signes britannique","Bislama":"Bichlamar","Tibetan":"Tibétain","Bosnian":"Bosniaque","Breton":"Breton","Bulgarian":"Bulgare","Brazilian Sign Language":"Langue des signes brésilienne","Catalan":"Catalan","Czech":"Tchèque","Chamorro":"Chamorro","Chechen":"Tchétchène","Chuvash":"Tchouvache","Cornish":"Cornique","Corsican":"Corse","Cree":"Cree","Czech Sign Language":"Langue des signes tchèque","Chinese Sign Language":"Langue des signes chinoise","Welsh":"Gallois","Danish":"Danois","German":"Allemand","Dhivehi":"Maldivien","Danish Sign Language":"Langue des signes danoise","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Grec moderne (après 1453)","English":"Anglais","Esperanto":"Espéranto","Estonian":"Estonien","Basque":"Basque","Ewe":"Éwé","Faroese":"Féroïen","Persian":"Persan","Fijian":"Fidjien","Finnish":"Finnois","French":"Français","Western Frisian":"Frison occidental","French Sign Language":"Langue des signes française","Fulah":"Peul","Scottish Gaelic":"Gaélique","Irish":"Irlandais","Galician":"Galicien","Manx":"Manx","Guarani":"Guarani","German Sign Language":"Langue des signes allemande","Gujarati":"Goudjrati","Haitian":"Haïtien","Hausa":"Haoussa","Serbo-Croatian":"Serbo-croate","Hebrew":"Hébreu","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri motu","Croatian":"Croate","Hungarian":"Hongrois","Armenian":"Arménien","Igbo":"Igbo","Sichuan Yi":"Yi de Sichuan","Inuktitut":"Inuktitut","Indonesian":"Indonésien","Inupiaq":"Inupiaq","Icelandic":"Islandais","Italian":"Italien","Javanese":"Javanais","Lojban":"Lojban","Japanese":"Japonais","Japanese Sign Language":"Langue des signes japonaise","Kalaallisut":"Groenlandais","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Géorgien","Kanuri":"Kanouri","Kazakh":"Kazakh","Khmer":"Khmer central","Kikuyu":"Kikuyu","Kinyarwanda":"Rwanda","Kirghiz":"Kirghiz","Komi":"Kom","Kongo":"Kongo","Korean":"Coréen","Kuanyama":"Kuanyama","Kurdish":"Kurde","Lao":"Lao","Latvian":"Letton","Limburgan":"Limbourgeois","Lingala":"Lingala","Lithuanian":"Lituanien","Luxembourgish":"Luxembourgeois","Luba-Katanga":"Luba-katanga","Ganda":"Ganda","Marshallese":"Marshall","Malayalam":"Malayalam","Marathi":"Marathe","Macedonian":"Macédonien","Malagasy":"Malgache","Maltese":"Maltais","Mongolian":"Mongol","Maori":"Maori","Malay (macrolanguage)":"Malais","Burmese":"Birman","Nauru":"Nauruan","Navajo":"Navaho","South Ndebele":"Ndébélé du Sud","North Ndebele":"Ndébélé du Nord","Ndonga":"Ndonga","Nepali (macrolanguage)":"Népalais","Dutch":"Néerlandais","Norwegian Nynorsk":"Norvégien nynorsk","Norwegian Bokmål":"Norvégien bokmål","Norwegian":"Norvégien","Nyanja":"Chichewa","Occitan":"Occitane","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya","Oromo":"Galla","Ossetian":"Ossète","Panjabi":"Pendjabi","Pakistan Sign Language":"Langue des signes pakistanaise","Polish":"Polonais","Portuguese":"Portugais","Pushto":"Pachto","Quechua":"Quechua","Romansh":"Romanche","Romanian":"Roumain","Russian Sign Language":"Langue des signes russe","Rundi":"Rundi","Russian":"Russe","Sango":"Sango","Saudi Arabian Sign Language":"Langue des signes saoudienne","South African Sign Language":"Langue des signes sud-africaine","Sinhala":"Singhalais","Slovak":"Slovaque","Slovenian":"Slovène","Northern Sami":"Sami du Nord","Samoan":"Samoan","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somali","Southern Sotho":"Sotho du Sud","Spanish":"Espagnol","Albanian":"Albanais","Sardinian":"Sarde","Serbian":"Serbe","Swati":"Swati","Sundanese":"Soundanais","Swahili (macrolanguage)":"Swahili","Swedish":"Suédois","Swedish Sign Language":"Langue des signes suédoise","Tahitian":"Tahitien","Tamil":"Tamoul","Tatar":"Tatar","Telugu":"Télougou","Tajik":"Tadjik","Tagalog":"Tagalog","Thai":"Thaï","Tigrinya":"Tigrigna","Klingon":"Klingon","Tonga (Tonga Islands)":"Tongan (Îles Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turkmène","Turkish":"Turc","Twi":"Twi","Uighur":"Ouïgour","Ukrainian":"Ukrainien","Urdu":"Ourdou","Uzbek":"Ouszbek","Venda":"Venda","Vietnamese":"Vietnamien","Walloon":"Wallon","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Chinois","Zulu":"Zoulou"} \ No newline at end of file +{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News & Politics":"Actualité & Politique","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d’œuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d’œuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Published":"Publiée","To transcode":"À transcoder","To import":"À importer","Pending":"En cours","Success":"Succès","Failed":"Échoué","This video does not exist.":"Cette vidéo n'existe pas.","We cannot fetch the video. Please try again later.":"Nous ne pouvons pas récupérer la vidéo. Merci de réessayer plus tard.","Sorry":"Désolé","This video is not available because the remote instance is not responding.":"Cette vidéo n'est pas disponible car l'instance distante ne répond pas.","Misc":"Divers","Unknown":"Inconnu","Afar":"Afar","Abkhazian":"Abkhaze","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharique","Arabic":"Arabe","Aragonese":"Aragonais","American Sign Language":"Langue des signes américaine","Assamese":"Assamais","Avaric":"Avar","Kotava":"Kotava","Aymara":"Aymara","Azerbaijani":"Azéri","Bashkir":"Bachkir","Bambara":"Bambara","Belarusian":"Biélorusse","Bengali":"Bengali","British Sign Language":"Langue des signes britannique","Bislama":"Bichlamar","Tibetan":"Tibétain","Bosnian":"Bosniaque","Breton":"Breton","Bulgarian":"Bulgare","Brazilian Sign Language":"Langue des signes brésilienne","Catalan":"Catalan","Czech":"Tchèque","Chamorro":"Chamorro","Chechen":"Tchétchène","Chuvash":"Tchouvache","Cornish":"Cornique","Corsican":"Corse","Cree":"Cree","Czech Sign Language":"Langue des signes tchèque","Chinese Sign Language":"Langue des signes chinoise","Welsh":"Gallois","Danish":"Danois","German":"Allemand","Dhivehi":"Maldivien","Danish Sign Language":"Langue des signes danoise","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Grec moderne (après 1453)","English":"Anglais","Esperanto":"Espéranto","Estonian":"Estonien","Basque":"Basque","Ewe":"Éwé","Faroese":"Féroïen","Persian":"Persan","Fijian":"Fidjien","Finnish":"Finnois","French":"Français","Western Frisian":"Frison occidental","French Sign Language":"Langue des signes française","Fulah":"Peul","Scottish Gaelic":"Gaélique","Irish":"Irlandais","Galician":"Galicien","Manx":"Manx","Guarani":"Guarani","German Sign Language":"Langue des signes allemande","Gujarati":"Goudjrati","Haitian":"Haïtien","Hausa":"Haoussa","Serbo-Croatian":"Serbo-croate","Hebrew":"Hébreu","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri motu","Croatian":"Croate","Hungarian":"Hongrois","Armenian":"Arménien","Igbo":"Igbo","Sichuan Yi":"Yi de Sichuan","Inuktitut":"Inuktitut","Indonesian":"Indonésien","Inupiaq":"Inupiaq","Icelandic":"Islandais","Italian":"Italien","Javanese":"Javanais","Lojban":"Lojban","Japanese":"Japonais","Japanese Sign Language":"Langue des signes japonaise","Kalaallisut":"Groenlandais","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Géorgien","Kanuri":"Kanouri","Kazakh":"Kazakh","Khmer":"Khmer central","Kikuyu":"Kikuyu","Kinyarwanda":"Rwanda","Kirghiz":"Kirghiz","Komi":"Kom","Kongo":"Kongo","Korean":"Coréen","Kuanyama":"Kuanyama","Kurdish":"Kurde","Lao":"Lao","Latvian":"Letton","Limburgan":"Limbourgeois","Lingala":"Lingala","Lithuanian":"Lituanien","Luxembourgish":"Luxembourgeois","Luba-Katanga":"Luba-katanga","Ganda":"Ganda","Marshallese":"Marshall","Malayalam":"Malayalam","Marathi":"Marathe","Macedonian":"Macédonien","Malagasy":"Malgache","Maltese":"Maltais","Mongolian":"Mongol","Maori":"Maori","Malay (macrolanguage)":"Malais","Burmese":"Birman","Nauru":"Nauruan","Navajo":"Navaho","South Ndebele":"Ndébélé du Sud","North Ndebele":"Ndébélé du Nord","Ndonga":"Ndonga","Nepali (macrolanguage)":"Népalais","Dutch":"Néerlandais","Norwegian Nynorsk":"Norvégien nynorsk","Norwegian Bokmål":"Norvégien bokmål","Norwegian":"Norvégien","Nyanja":"Chichewa","Occitan":"Occitane","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya","Oromo":"Galla","Ossetian":"Ossète","Panjabi":"Pendjabi","Pakistan Sign Language":"Langue des signes pakistanaise","Polish":"Polonais","Portuguese":"Portugais","Pushto":"Pachto","Quechua":"Quechua","Romansh":"Romanche","Romanian":"Roumain","Russian Sign Language":"Langue des signes russe","Rundi":"Rundi","Russian":"Russe","Sango":"Sango","Saudi Arabian Sign Language":"Langue des signes saoudienne","South African Sign Language":"Langue des signes sud-africaine","Sinhala":"Singhalais","Slovak":"Slovaque","Slovenian":"Slovène","Northern Sami":"Sami du Nord","Samoan":"Samoan","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somali","Southern Sotho":"Sotho du Sud","Spanish":"Espagnol","Albanian":"Albanais","Sardinian":"Sarde","Serbian":"Serbe","Swati":"Swati","Sundanese":"Soundanais","Swahili (macrolanguage)":"Swahili","Swedish":"Suédois","Swedish Sign Language":"Langue des signes suédoise","Tahitian":"Tahitien","Tamil":"Tamoul","Tatar":"Tatar","Telugu":"Télougou","Tajik":"Tadjik","Tagalog":"Tagalog","Thai":"Thaï","Tigrinya":"Tigrigna","Klingon":"Klingon","Tonga (Tonga Islands)":"Tongan (Îles Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turkmène","Turkish":"Turc","Twi":"Twi","Uighur":"Ouïgour","Ukrainian":"Ukrainien","Urdu":"Ourdou","Uzbek":"Ouszbek","Venda":"Venda","Vietnamese":"Vietnamien","Walloon":"Wallon","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Chinois","Zulu":"Zoulou"} \ No newline at end of file diff --git a/client/src/locale/target/server_nl_NL.xml b/client/src/locale/target/server_nl_NL.xml index 797d022c5..a53a90588 100644 --- a/client/src/locale/target/server_nl_NL.xml +++ b/client/src/locale/target/server_nl_NL.xml @@ -43,6 +43,10 @@ Entertainment Entertainment + + News & Politics + Nieuws en Politiek + How To Tutorials @@ -57,7 +61,7 @@ Science & Technology - Wetenschap & technologie + Wetenschap en technologie Animals @@ -77,7 +81,7 @@ Attribution - Share Alike - Naamsvermelding – Gelijk Delen + Naamsvermelding – Gelijken Delen Attribution - No Derivatives @@ -111,9 +115,33 @@ Private Privé + + Published + Gepubliceerd + + + To transcode + Transcoden + + + To import + Importeren + + + Pending + In behandeling + + + Success + Success + + + Failed + Gefaald + Misc - Diverse + Varia Unknown diff --git a/client/src/main.ts b/client/src/main.ts index dee962180..86fdabba5 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -34,7 +34,7 @@ const bootstrap = () => platformBrowserDynamic() // .catch(err => console.error('Cannot register service worker.', err)) // } - if (navigator.serviceWorker) { + if (navigator.serviceWorker && typeof navigator.serviceWorker.getRegistrations === 'function') { navigator.serviceWorker.getRegistrations() .then(registrations => { for (const registration of registrations) { diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 2356f9837..478737a43 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -23,7 +23,7 @@ body { // now beware node-sass requires interpolation // for css custom properties #{$var} --mainColor: #{$orange-color}; - --mainHoverColor: #{$orange-hoover-color}; + --mainHoverColor: #{$orange-hover-color}; --mainBackgroundColor: #{$bg-color}; --mainForegroundColor: #{$fg-color}; --menuBackgroundColor: #{$menu-background}; @@ -229,13 +229,12 @@ label { font-weight: $font-semibold; } - .close { + my-global-icon { @include icon(24px); position: relative; top: 3px; float: right; - background-image: url('../assets/images/global/cross.svg'); margin: 0; padding: 0; @@ -293,6 +292,10 @@ ngb-tabset.bootstrap { color: var(--mainForegroundColor) !important; } } + + .nav-pills .nav-link.active { + color: #000 !important; + } } .nav-tabs .nav-link.active { @@ -324,7 +327,7 @@ ngb-tabset.bootstrap { table { .action-button-edit, .action-button-delete { &:hover, &:active, &:focus, &[disabled], &.disabled { - background-color: $grey-color !important; + background-color: $grey-background-color !important; } } } @@ -389,4 +392,4 @@ table { } } } -} \ No newline at end of file +} diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index d6f391a45..e18e9ae9d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -55,6 +55,18 @@ hyphens: auto; } +@mixin apply-svg-color ($color) { + /deep/ svg { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"], circle[fill="#000000"] { + fill: $color; + } + + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"], circle[stroke="#000000"] { + stroke: $color; + } + } +} + @mixin peertube-input-text($width) { display: inline-block; height: $button-height; @@ -64,6 +76,7 @@ border-radius: 3px; padding-left: 15px; padding-right: 15px; + font-size: 15px; &::placeholder { color: var(--inputPlaceholderColor); @@ -110,22 +123,30 @@ color: #fff; background-color: #C6C6C6; } + + my-global-icon { + @include apply-svg-color(#fff) + } } @mixin grey-button { &, &:active, &:focus { - background-color: $grey-color; - color: #585858; + background-color: $grey-background-color; + color: $grey-foreground-color; } &:hover, &:active, &:focus, &[disabled], &.disabled { - color: #585858; - background-color: $grey-hoover-color; + color: $grey-foreground-color; + background-color: $grey-background-hover-color; } &[disabled], &.disabled { cursor: default; } + + my-global-icon { + @include apply-svg-color($grey-foreground-color) + } } @mixin peertube-button { @@ -148,6 +169,15 @@ @include peertube-button; } +@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { + my-global-icon { + position: relative; + width: $width; + margin-right: $margin-right; + top: $top; + } +} + @mixin peertube-button-file ($width) { position: relative; overflow: hidden; @@ -231,6 +261,10 @@ color: transparent; text-shadow: 0 0 0 #000; } + + option { + color: #000; + } } } @@ -455,18 +489,10 @@ } } -@mixin create-button ($imageUrl) { +@mixin create-button { @include peertube-button-link; @include orange-button; - - .icon.icon-add { - @include icon(20px); - - position: relative; - top: -1px; - margin-right: 5px; - background-image: url($imageUrl); - } + @include button-with-icon(20px, 5px, -1px); } @mixin row-blocks { diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index fdf33b12a..3780b7501 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -6,10 +6,13 @@ $font-regular: 400; $font-semibold: 600; $font-bold: 700; -$grey-color: #E5E5E5; -$grey-hoover-color: #EFEFEF;; +$grey-background-color: #E5E5E5; +$grey-background-hover-color: #EFEFEF; +$grey-foreground-color: #585858; +$grey-foreground-hover-color: #303030; + $orange-color: #F1680D; -$orange-hoover-color: #F97D46; +$orange-hover-color: #F97D46; $bg-color: #fff; $fg-color: #000; diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 58a6a0004..6e502b028 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -14,7 +14,7 @@ p-table { .ui-table-caption { border: none !important; - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; .caption { height: 40px; @@ -24,7 +24,7 @@ p-table { } th { - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; outline: 0; } @@ -122,10 +122,14 @@ p-table { &.pi-sort-up { @extend .glyphicon-triangle-top; + + color: var(--mainForegroundColor) !important; } &.pi-sort-down { @extend .glyphicon-triangle-bottom; + + color: var(--mainForegroundColor) !important; } } } @@ -193,7 +197,7 @@ p-table { height: auto !important; a { - color: #000 !important; + color: var(--mainForegroundColor) !important; font-weight: $font-semibold !important; margin: 0 5px !important; outline: 0 !important; @@ -230,6 +234,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-right; @include glyphicon-light; + color: #000 !important; text-align: right; .pi.pi-chevron-right { @@ -241,6 +246,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-left; @include glyphicon-light; + color: #000 !important; text-align: left; .pi.pi-chevron-left { @@ -254,42 +260,53 @@ p-calendar .ui-datepicker { .pi.pi-chevron-up { @extend .glyphicon-chevron-up; @include glyphicon-light; + + color: #000 !important; } .pi.pi-chevron-down { @extend .glyphicon-chevron-down; @include glyphicon-light; + + color: #000 !important; } } } +.ui-chkbox { -.ui-chkbox-box { - &.ui-state-active { - border-color: var(--mainColor) !important; - background-color: var(--mainColor) !important; + &, .ui-chkbox-box { + width: 18px !important; + height: 18px !important; } - .ui-chkbox-icon { - position: relative; - overflow: visible !important; - - &:after { - content: ''; - position: absolute; - top: 1px; - left: 7px; - width: 5px; - height: 13px; - opacity: 0; - transform: rotate(45deg) scale(0); - border-right: 2px solid var(--mainBackgroundColor); - border-bottom: 2px solid var(--mainBackgroundColor); + .ui-chkbox-box { + &.ui-state-active { + border-color: var(--mainColor) !important; + background-color: var(--mainColor) !important; } - &.pi-check:after { - opacity: 1; - transform: rotate(45deg) scale(1); + .ui-chkbox-icon { + position: relative; + overflow: visible !important; + + &:after { + content: ''; + position: absolute; + top: 1px; + left: 6px; + width: 5px; + height: 12px; + opacity: 0; + transform: rotate(45deg) scale(0); + border-right: 2px solid var(--mainBackgroundColor); + border-bottom: 2px solid var(--mainBackgroundColor); + } + + &.pi-check:after { + opacity: 1; + transform: rotate(45deg) scale(1); + } } } } @@ -301,6 +318,11 @@ p-inputswitch { } p-toast { + .ui-toast { + // Modal is 10005 + z-index: 10010 !important; + } + .ui-toast-message { font-family: $main-fonts; @@ -349,3 +371,7 @@ p-toast { } } } + +.ui-widget { + font-family: $main-fonts !important; +} diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html index b7cf13ec2..c3b6e08ca 100644 --- a/client/src/standalone/videos/embed.html +++ b/client/src/standalone/videos/embed.html @@ -6,6 +6,7 @@ + @@ -13,7 +14,7 @@
-

Sorry

+

diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 3a09f285e..32bf42e12 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -17,17 +17,19 @@ import 'core-js/es6/set' // For google bot that uses Chrome 41 and does not understand fetch import 'whatwg-fetch' -// FIXME: something weird with our path definition in tsconfig and typings -// @ts-ignore -import * as vjs from 'video.js' - import * as Channel from 'jschannel' import { peertubeTranslate, ResultList, VideoDetails } from '../../../../shared' -import { addContextMenu, getServerTranslations, getVideojsOptions, loadLocaleInVideoJS } from '../../assets/player/peertube-player' import { PeerTubeResolution } from '../player/definitions' import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings' import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' +import { + P2PMediaLoaderOptions, + PeertubePlayerManager, + PeertubePlayerManagerOptions, + PlayerMode +} from '../../assets/player/peertube-player-manager' +import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type' /** * Embed API exposes control of the embed player to the outside world via @@ -73,16 +75,16 @@ class PeerTubeEmbedApi { } private setResolution (resolutionId: number) { - if (resolutionId === -1 && this.embed.player.peertube().isAutoResolutionForbidden()) return + if (resolutionId === -1 && this.embed.player.webtorrent().isAutoResolutionForbidden()) return // Auto resolution if (resolutionId === -1) { - this.embed.player.peertube().enableAutoResolution() + this.embed.player.webtorrent().enableAutoResolution() return } - this.embed.player.peertube().disableAutoResolution() - this.embed.player.peertube().updateResolution(resolutionId) + this.embed.player.webtorrent().disableAutoResolution() + this.embed.player.webtorrent().updateResolution(resolutionId) } /** @@ -122,15 +124,17 @@ class PeerTubeEmbedApi { // PeerTube specific capabilities - this.embed.player.peertube().on('autoResolutionUpdate', () => this.loadResolutions()) - this.embed.player.peertube().on('videoFileUpdate', () => this.loadResolutions()) + if (this.embed.player.webtorrent) { + this.embed.player.webtorrent().on('autoResolutionUpdate', () => this.loadWebTorrentResolutions()) + this.embed.player.webtorrent().on('videoFileUpdate', () => this.loadWebTorrentResolutions()) + } } - private loadResolutions () { + private loadWebTorrentResolutions () { let resolutions = [] - let currentResolutionId = this.embed.player.peertube().getCurrentResolutionId() + let currentResolutionId = this.embed.player.webtorrent().getCurrentResolutionId() - for (const videoFile of this.embed.player.peertube().videoFiles) { + for (const videoFile of this.embed.player.webtorrent().videoFiles) { let label = videoFile.resolution.label if (videoFile.fps && videoFile.fps >= 50) { label += videoFile.fps @@ -164,6 +168,7 @@ class PeerTubeEmbed { subtitle: string enableApi = false startTime: number | string = 0 + mode: PlayerMode scope = 'peertube' static async main () { @@ -192,27 +197,33 @@ class PeerTubeEmbed { element.parentElement.removeChild(element) } - displayError (text: string) { + displayError (text: string, translations?: { [ id: string ]: string }) { // Remove video element if (this.videoElement) this.removeElement(this.videoElement) - document.title = 'Sorry - ' + text + const translatedText = peertubeTranslate(text, translations) + const translatedSorry = peertubeTranslate('Sorry', translations) + + document.title = translatedSorry + ' - ' + translatedText const errorBlock = document.getElementById('error-block') errorBlock.style.display = 'flex' + const errorTitle = document.getElementById('error-title') + errorTitle.innerHTML = peertubeTranslate('Sorry', translations) + const errorText = document.getElementById('error-content') - errorText.innerHTML = text + errorText.innerHTML = translatedText } - videoNotFound () { + videoNotFound (translations?: { [ id: string ]: string }) { const text = 'This video does not exist.' - this.displayError(text) + this.displayError(text, translations) } - videoFetchError () { + videoFetchError (translations?: { [ id: string ]: string }) { const text = 'We cannot fetch the video. Please try again later.' - this.displayError(text) + this.displayError(text, translations) } getParamToggle (params: URLSearchParams, name: string, defaultValue?: boolean) { @@ -251,6 +262,8 @@ class PeerTubeEmbed { this.scope = this.getParamString(params, 'scope', this.scope) this.subtitle = this.getParamString(params, 'subtitle') this.startTime = this.getParamString(params, 'start') + + this.mode = this.getParamString(params, 'mode') === 'p2p-media-loader' ? 'p2p-media-loader' : 'webtorrent' } catch (err) { console.error('Cannot get params from URL.', err) } @@ -260,17 +273,16 @@ class PeerTubeEmbed { const urlParts = window.location.pathname.split('/') const videoId = urlParts[ urlParts.length - 1 ] - const [ , serverTranslations, videoResponse, captionsResponse ] = await Promise.all([ - loadLocaleInVideoJS(window.location.origin, vjs, navigator.language), - getServerTranslations(window.location.origin, navigator.language), + const [ serverTranslations, videoResponse, captionsResponse ] = await Promise.all([ + PeertubePlayerManager.getServerTranslations(window.location.origin, navigator.language), this.loadVideoInfo(videoId), this.loadVideoCaptions(videoId) ]) if (!videoResponse.ok) { - if (videoResponse.status === 404) return this.videoNotFound() + if (videoResponse.status === 404) return this.videoNotFound(serverTranslations) - return this.videoFetchError() + return this.videoFetchError(serverTranslations) } const videoInfo: VideoDetails = await videoResponse.json() @@ -286,50 +298,74 @@ class PeerTubeEmbed { this.loadParams() - const videojsOptions = getVideojsOptions({ - autoplay: this.autoplay, - controls: this.controls, - muted: this.muted, - loop: this.loop, - startTime: this.startTime, - subtitle: this.subtitle, - - videoCaptions, - inactivityTimeout: 1500, - videoViewUrl: this.getVideoUrl(videoId) + '/views', - playerElement: this.videoElement, - videoFiles: videoInfo.files, - videoDuration: videoInfo.duration, - enableHotkeys: true, - peertubeLink: true, - poster: window.location.origin + videoInfo.previewPath, - theaterMode: false - }) + const options: PeertubePlayerManagerOptions = { + common: { + autoplay: this.autoplay, + controls: this.controls, + muted: this.muted, + loop: this.loop, + captions: videoCaptions.length !== 0, + startTime: this.startTime, + subtitle: this.subtitle, + + videoCaptions, + inactivityTimeout: 1500, + videoViewUrl: this.getVideoUrl(videoId) + '/views', + + playerElement: this.videoElement, + onPlayerElementChange: (element: HTMLVideoElement) => this.videoElement = element, + + videoDuration: videoInfo.duration, + enableHotkeys: true, + peertubeLink: true, + poster: window.location.origin + videoInfo.previewPath, + theaterMode: false, + + serverUrl: window.location.origin, + language: navigator.language, + embedUrl: window.location.origin + videoInfo.embedPath + }, + + webtorrent: { + videoFiles: videoInfo.files + } + } - this.playerOptions = videojsOptions - this.player = vjs(this.videoContainerId, videojsOptions, () => { - this.player.on('customError', (event: any, data: any) => this.handleError(data.err)) + if (this.mode === 'p2p-media-loader') { + const hlsPlaylist = videoInfo.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + + Object.assign(options, { + p2pMediaLoader: { + playlistUrl: hlsPlaylist.playlistUrl, + segmentsSha256Url: hlsPlaylist.segmentsSha256Url, + redundancyBaseUrls: hlsPlaylist.redundancies.map(r => r.baseUrl), + trackerAnnounce: videoInfo.trackerUrls, + videoFiles: videoInfo.files + } as P2PMediaLoaderOptions + }) + } - window[ 'videojsPlayer' ] = this.player + this.player = await PeertubePlayerManager.initialize(this.mode, options) - if (this.controls) { - this.player.dock({ - title: videoInfo.name, - description: this.player.localize('Uses P2P, others may know your IP is downloading this video.') - }) - } + this.player.on('customError', (event: any, data: any) => this.handleError(data.err, serverTranslations)) - addContextMenu(this.player, window.location.origin + videoInfo.embedPath) + window[ 'videojsPlayer' ] = this.player - this.initializeApi() - }) + if (this.controls) { + this.player.dock({ + title: videoInfo.name, + description: this.player.localize('Uses P2P, others may know your IP is downloading this video.') + }) + } + + this.initializeApi() } - private handleError (err: Error) { + private handleError (err: Error, translations?: { [ id: string ]: string }) { if (err.message.indexOf('from xs param') !== -1) { this.player.dispose() this.videoElement = null - this.displayError('This video is not available because the remote instance is not responding.') + this.displayError('This video is not available because the remote instance is not responding.', translations) return } } diff --git a/client/src/tsconfig.app.json b/client/src/tsconfig.app.json index af7a74e9e..729eee353 100644 --- a/client/src/tsconfig.app.json +++ b/client/src/tsconfig.app.json @@ -3,7 +3,7 @@ "compilerOptions": { "outDir": "../out-tsc/app", "baseUrl": "./", - "module": "es2015", + "module": "esnext", "types": [], "lib": [ "es2017", diff --git a/client/tsconfig.json b/client/tsconfig.json index beca79e01..3f9986f8a 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -5,6 +5,7 @@ "sourceMap": true, "declaration": false, "moduleResolution": "node", + "module": "esnext", "emitDecoratorMetadata": true, "experimentalDecorators": true, "noImplicitAny": true, diff --git a/client/yarn.lock b/client/yarn.lock index 5ed43117a..63394e0f7 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2,139 +2,141 @@ # yarn lockfile v1 -"@angular-devkit/architect@0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.11.1.tgz#fb8429b583d4d7efafe5ff551ffdd30a705b9ab0" - integrity sha512-MdcZ5KclwL2SBXCQSn8uI2hakBX58EyuAwFWsM/pKrNt9j8RqIk93l4amd2OkaMtZRFP5zWodyf/3qOwacjuQg== +"@angular-devkit/architect@0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.1.tgz#39597ce94f72d89bdd89ee567cb937cff4c13b98" + integrity sha512-QDmIbqde75ZZSEFbw6Q6kQWq4cY6C7D67yujXw6XTyubDNAs1tyXJyxTIB8vjSlEKwRizTTDd/B0ZXVcke3Mvw== dependencies: - "@angular-devkit/core" "7.1.1" + "@angular-devkit/core" "7.3.1" rxjs "6.3.3" -"@angular-devkit/build-angular@~0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.11.1.tgz#a828797d9177227aee70a65bb06d4b189b1404cd" - integrity sha512-hA/3GVMmRwOPXWhImrBG9gZTdERr937NMuedKhTXuNj6TNMNjk9XQ+q2erd0LZVbgfhL/nC0wHnpy0dUWXu8jA== - dependencies: - "@angular-devkit/architect" "0.11.1" - "@angular-devkit/build-optimizer" "0.11.1" - "@angular-devkit/build-webpack" "0.11.1" - "@angular-devkit/core" "7.1.1" - "@ngtools/webpack" "7.1.1" - ajv "6.5.3" - autoprefixer "9.3.1" +"@angular-devkit/build-angular@~0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.1.tgz#369febda48dd40e47a4f0077064e792612a8e1c1" + integrity sha512-vkKwMVQ+NNCcVR3HFMffS+Mq4b2afXeUjI+02N38hBuFTppnC83uivUB6Uu2NUk5NTSQA4BnJlG5CbMs6N4QYg== + dependencies: + "@angular-devkit/architect" "0.13.1" + "@angular-devkit/build-optimizer" "0.13.1" + "@angular-devkit/build-webpack" "0.13.1" + "@angular-devkit/core" "7.3.1" + "@ngtools/webpack" "7.3.1" + ajv "6.7.0" + autoprefixer "9.4.6" circular-dependency-plugin "5.0.2" clean-css "4.2.1" - copy-webpack-plugin "4.5.4" - file-loader "2.0.0" + copy-webpack-plugin "4.6.0" + file-loader "3.0.1" glob "7.1.3" - istanbul "0.4.5" istanbul-instrumenter-loader "3.0.1" karma-source-map-support "1.3.0" - less "3.8.1" + less "3.9.0" less-loader "4.1.0" - license-webpack-plugin "2.0.2" - loader-utils "1.1.0" - mini-css-extract-plugin "0.4.4" + license-webpack-plugin "2.1.0" + loader-utils "1.2.3" + mini-css-extract-plugin "0.5.0" minimatch "3.0.4" - opn "5.3.0" + opn "5.4.0" parse5 "4.0.0" - portfinder "1.0.17" - postcss "7.0.5" - postcss-import "12.0.0" + postcss "7.0.14" + postcss-import "12.0.1" postcss-loader "3.0.0" - raw-loader "0.5.1" + raw-loader "1.0.0" rxjs "6.3.3" sass-loader "7.1.0" - semver "5.5.1" + semver "5.6.0" source-map-loader "0.2.4" - source-map-support "0.5.9" - speed-measure-webpack-plugin "1.2.3" + source-map-support "0.5.10" + speed-measure-webpack-plugin "1.3.0" stats-webpack-plugin "0.7.0" style-loader "0.23.1" stylus "0.54.5" stylus-loader "3.0.2" - terser-webpack-plugin "1.1.0" - tree-kill "1.2.0" - webpack "4.23.1" - webpack-dev-middleware "3.4.0" - webpack-dev-server "3.1.10" - webpack-merge "4.1.4" + terser-webpack-plugin "1.2.2" + tree-kill "1.2.1" + webpack "4.29.0" + webpack-dev-middleware "3.5.1" + webpack-dev-server "3.1.14" + webpack-merge "4.2.1" webpack-sources "1.3.0" webpack-subresource-integrity "1.1.0-rc.6" optionalDependencies: - node-sass "4.10.0" + node-sass "4.11.0" -"@angular-devkit/build-optimizer@0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.11.1.tgz#1079737a44b26b39e35cea7f966a39cd11bbbf48" - integrity sha512-pyFP6ykZf8Iq8nRkgP2XKq8knpIG6ye0qYklnBC9815AC5RAO126Y4fmtd6tnH+5p1mQxnt5HegG0j5xOCgDRw== +"@angular-devkit/build-optimizer@0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.1.tgz#56151179bd6427918ba8e0f5a7e581e5daa00294" + integrity sha512-LmvHiI3H451aVWY5Ac6Fqz0i1eX/mUfWN+uJvo8NaL6Jc0HKYX2o3l4ODr8UUECWWctUC9AMD522ZMwAvnvsKQ== dependencies: - loader-utils "1.1.0" + loader-utils "1.2.3" source-map "0.5.6" - typescript "3.1.6" - webpack-sources "1.2.0" + typescript "3.2.4" + webpack-sources "1.3.0" -"@angular-devkit/build-webpack@0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.11.1.tgz#bd98ff3dea633c5b77671b471e72cf6c91f6c679" - integrity sha512-p7fPHOi2Wfq2VPtnRVowg3n99MujghpOp6zW0gBJQD1TQhGVzPK6AX42S0NA4d05ahNBCDU2n7Y+5TjNJRIGJw== +"@angular-devkit/build-webpack@0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.1.tgz#98d666765705e9379c9b2e0a3b6dfcd0347a2a32" + integrity sha512-OGwC7bAl3u+w7Glw+OqIrN7OD1BkDXgrWbeQSpKAmsx6VdNPCnI4NPS+JldWNp70LVlE2nQlJUhtEqMVfBMnlg== dependencies: - "@angular-devkit/architect" "0.11.1" - "@angular-devkit/core" "7.1.1" + "@angular-devkit/architect" "0.13.1" + "@angular-devkit/core" "7.3.1" rxjs "6.3.3" -"@angular-devkit/core@7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.1.1.tgz#ce0a674f16188072988502cc3f073b15efcfe194" - integrity sha512-rODqECpOiV6vX+L1qd63GLiF3SG+V1O+d8WYtnKPOxnsMM9yWpWmqmroHtXfisjucu/zwoqj8HoO/noJZCfynw== +"@angular-devkit/core@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.1.tgz#d92f6545796579cabdcfc29579a2c977f7a96c6c" + integrity sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ== dependencies: - ajv "6.5.3" + ajv "6.7.0" chokidar "2.0.4" fast-json-stable-stringify "2.0.0" rxjs "6.3.3" source-map "0.7.3" -"@angular-devkit/schematics@7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.1.1.tgz#328ec6071c5ef3b1588a9f4bc97f5edfc3620b09" - integrity sha512-yjzTw8ZWMPg0Fc9VQCHNpUCAH7aiNxrUDs0IbhdC0CyKTBoqH+cx2xP4Z6ECf4uNwceLKJlE0l3ot42Ypnlziw== +"@angular-devkit/schematics@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.1.tgz#7dc704005b966ea6c1ee62f380120183bb76eee6" + integrity sha512-cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg== dependencies: - "@angular-devkit/core" "7.1.1" + "@angular-devkit/core" "7.3.1" rxjs "6.3.3" -"@angular/animations@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.1.1.tgz#8fecbd19417364946a9ea40c8fdf32462110232f" - integrity sha512-iTNxhPPraCZsE4rgM23lguT1kDV4mfYAr+Bsi5J0+v9ZJA+VaKvi6eRW8ZGrx4/rDz6hzTnBn1jgPppHFbsOcw== +"@angular/animations@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.4.tgz#4d0a0b9f14d6bfc38ca773613b61729d020435e6" + integrity sha512-Wx6cqU6koFOASlyl4aCygtbtROoehU6OKwV2EZTkfzHx6Eu/QyTiSa5kyoApVM5LMmCNeb8SxJMSAnKXztNl0A== dependencies: tslib "^1.9.0" -"@angular/cli@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.1.1.tgz#c5dd2b92c5c3391f20262b5e530813e4e2d31777" - integrity sha512-lPVKsk035T5Ls0Mf83OngrNoLZu/ucZSjRLN/GWZK1O/YYVmb/dTgVl/a7HC+G480tWQ34nlqnCRbrP7sE9v7g== - dependencies: - "@angular-devkit/architect" "0.11.1" - "@angular-devkit/core" "7.1.1" - "@angular-devkit/schematics" "7.1.1" - "@schematics/angular" "7.1.1" - "@schematics/update" "0.11.1" - inquirer "6.2.0" - opn "5.3.0" - semver "5.5.1" +"@angular/cli@~7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.1.tgz#a18acdec84deb03a1fae79cae415bbc8f9c87ffa" + integrity sha512-8EvXYRhTqTaTk5PKv7VZxIWJiyG51R9RC9gtpRFx4bbnurqBHdEUxGMmaRsGT8QDbfvVsWnuakE0eeW1CrfZAQ== + dependencies: + "@angular-devkit/architect" "0.13.1" + "@angular-devkit/core" "7.3.1" + "@angular-devkit/schematics" "7.3.1" + "@schematics/angular" "7.3.1" + "@schematics/update" "0.13.1" + "@yarnpkg/lockfile" "1.1.0" + ini "1.3.5" + inquirer "6.2.1" + npm-package-arg "6.1.0" + opn "5.4.0" + pacote "9.4.0" + semver "5.6.0" symbol-observable "1.2.0" -"@angular/common@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.1.1.tgz#f78f884614ef81ab2fd648f1aa3e83aae370a6c8" - integrity sha512-SngekFx9v39sjgi9pON0Wehxpu+NdUk7OEebw4Fa8dKqTgydTkuhmnNH+9WQe264asoeCt51oufPRjIqMLNohA== +"@angular/common@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.4.tgz#9f1ed530e5dc7613a263e015c203ead390d50336" + integrity sha512-3/i8RtnLTx/90gJHk5maE8zwsSiHgHvLItaa0qVfNlWiU0eCId/PL6TgDkut5vN9SQYL0oxhxFaVd35HmwsmuQ== dependencies: tslib "^1.9.0" -"@angular/compiler-cli@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.1.1.tgz#c5f6225fb72b56f42fa78c332fdee9755c64604e" - integrity sha512-4NXlkDhOEQgaP3Agigqw93CvXJvsfnXa0xiglq9e/wjL+6XbtM9WcDb5lfRQz41N9RSkO3pEHGvKMweKZGgogA== +"@angular/compiler-cli@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.4.tgz#3de23fd5f558a859a444c58dab18f2981c9c2937" + integrity sha512-UhLosSeuwFIfaGqGcYOh9WSOuzEpeuhIRAOt81MeqOQEqkoreUjfxrQq8XWNkdqsPZHtiptF5ZwXlMBxlj9jJg== dependencies: canonical-path "1.0.0" chokidar "^1.4.2" @@ -148,64 +150,64 @@ tslib "^1.9.0" yargs "9.0.1" -"@angular/compiler@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.1.1.tgz#4efbcad27ab43d4cd36d936a8df2e073f6d02d0a" - integrity sha512-oJvBe8XZ+DXF/W/DxWBTbBcixJTuPeZWdkcZIGWhJoQP7K5GnGnj8ffP9Lp6Dh4TKv85awtC6OfIKhbHxa650Q== +"@angular/compiler@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.4.tgz#133eb97fc3169ec9ff84f134eb9e3497fa37537e" + integrity sha512-+zyMzPCL45ePEV9nrnYJvhAVgp2Y19bDaq0f0YdZAqAjgDqHzXGGR6wX8GueyJWmUYWx5vwK6Apla4HwDrYA1w== dependencies: tslib "^1.9.0" -"@angular/core@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.1.1.tgz#9748b0103cd86226554e1ccbd0f43dd8c46f1ed1" - integrity sha512-Osig5SRgDRQ+Hec/liN7nq/BCJieB+4/pqRh9rFbOXezb2ptgRZqdXOXN8P17i4AwPVf308Mh55V0niJ5Eu3Rw== +"@angular/core@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.4.tgz#a6c84940c8edcfa37158f666a1f99c6e4a97bf95" + integrity sha512-kfAxhIxl89PmB7y81FR/RAv0yWRFcEYxEnTwV+o8jKGfemAXtQ0g/Vh+lJR0SD/TBgFilMxotN1mhwH4A8GShw== dependencies: tslib "^1.9.0" -"@angular/forms@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.1.1.tgz#d16ef10a901c007062fd19144cd77917ef55ee24" - integrity sha512-yCWuPjpu23Wc3XUw7v/ACNn/e249oT0bYlM8aaMQ1F5OwrmmC4NJC12Rpl9Ihza61RIHIKzNcHVEgzc7WhcSag== +"@angular/forms@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.4.tgz#be89cf83ad16fa3c813c12e4cff85da5409cf7a0" + integrity sha512-DAtOrdlTRsgvmZrsvczCAkY8dhTwZb5DXBmPuSXh0UR9lvEiCgNHGbwEiIiIkAHpw1wSeXZrq0qyy/oJRvf18g== dependencies: tslib "^1.9.0" -"@angular/http@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.1.1.tgz#f19f17ad42e7f3cdabcf1250ca757640d0f02219" - integrity sha512-pRk+c/kz9aJ8te5xzCxlPLpFnwB0d/E9YkOo3/ydaXF9vZw13RTzk00YyzJ41PDzJf8oPDdXtueTQ+vtJ7Srtw== +"@angular/http@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.4.tgz#fc151ac15c8c7542cb7242a430ad2319655c2ff5" + integrity sha512-kazJREm7MtSCYbE+9zU/CcUXI5Csu53PooeQlAp80/TOHqry6fVKIMHCI892Db9ScY2ds0SzbyTmrxEQo7PP1A== dependencies: tslib "^1.9.0" -"@angular/language-service@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.1.1.tgz#6bbe35b2430ad54618a1803f881efb5894b296c9" - integrity sha512-X+5g20PMtNRGZIa3svMv4PLJdJehn4wqrS8nwOtzH5XkSn5vA3IxjsJVdSzAy2AN0/sKKJK5jmQorPtKO4saJg== +"@angular/language-service@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.4.tgz#db72460040b070410cbff678410c142f4d682af8" + integrity sha512-A9Rud/27hHMSUUjpgn57nVeLsoYgdvFwJhtlZA/oCuSpmlD+LqqBsEpPhivwn++u44+DSrFXsic29jlFnsBotw== -"@angular/platform-browser-dynamic@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.1.1.tgz#6945298446173338782f437a996226110cda0d3e" - integrity sha512-ZIu48Vn4S6gjD7CMbGlKGaPQ8v9rYkWzlNYi4vTYzgiqKKNC3hqLsVESU3mSvr5oeQBxSIBidTdHSyafHFrA2w== +"@angular/platform-browser-dynamic@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.4.tgz#24dce1bb0d9dab541b3b1b3eda3084a732f11b64" + integrity sha512-J/xWlmaYOPUoCHZ5TiIRiyYa4uRMtCz3aGdBfY8k/NWtNo8SCYaS3aut7Sk4RS5rK8aAVi+aYFlY5YOrlW+Hbg== dependencies: tslib "^1.9.0" -"@angular/platform-browser@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.1.1.tgz#a6bd408f656dc43ee5a2d8af3dfaa786c7c1dfca" - integrity sha512-I6OPjecynGJSbPtzu0gvEgSmIR6X6/xEAhg4L9PycW1ryjzptTC9klWRTWIqsIBqMxhVnY44uKLeRNrDwMOwyA== +"@angular/platform-browser@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.4.tgz#2cf5305878d0620d6b8c02eff00ac3ca8dbc5970" + integrity sha512-Klt8aKR5SP9bqfMfpSY5vQOY7AQEs8JGuZOk5Bfc2dUtYT2IEIvK2IqO8v2rcFRVO13HOPUxl328efyHqLgI7g== dependencies: tslib "^1.9.0" -"@angular/router@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.1.1.tgz#80a4cdffc03a529b73485c2ad63a30ec435364ea" - integrity sha512-jbnqEq/1iDBkeH8Vn13hauGPTzhwllWM+MLfmdNGTiMzGRx4pmkWa57seDOeBF/GNYBL9JjkWTCrkKFAc2FJKw== +"@angular/router@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.4.tgz#83f1997c2a4e6acda93b991b8d7f3dad2b3f91f0" + integrity sha512-T8Uqf2H1SV1MQI38WwYJ4aa+4NNnvlp2Tp/rkfg6tKcp/cLkKqE6OOfiy9lmW+i/624v8tMgYoBMOUNBjAG23g== dependencies: tslib "^1.9.0" -"@angular/service-worker@~7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.1.1.tgz#c9e6f0265d7e102d8271483519cf09a180f0e08b" - integrity sha512-xX00x0XMW47jEfYTZLwdJCqkmPE7+mdtlSeOGpjaKv6Y2hqZodz80RYgH5JltM4RKEzOvQolR6KmdKcw1ANs9Q== +"@angular/service-worker@~7.2.4": + version "7.2.4" + resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.4.tgz#d16d6d08c0d5c29c93e9f80cddc4013c9b8859fb" + integrity sha512-IYsHshkgCYYmWLwtP7wwk8tfwphE4IJrkUitEu+ST6x+er/K9LyLo09WQeEZHIwDaPm9icoqc3TJJdXI46mrmg== dependencies: tslib "^1.9.0" @@ -321,16 +323,16 @@ dependencies: tslib "^1.9.0" -"@ngtools/webpack@7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.1.1.tgz#c418e1cb0d70a77d06e8c32500fe2e92e606ea52" - integrity sha512-XW/YDjiDZlwOYK4YvGAIKIVEkqtdwPLwTWAmDbnfpEHQc8UALsBrzGdjze0jSfXQdQxkbmXo0aolZgNc7uL/wQ== +"@ngtools/webpack@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.1.tgz#4ff68007fd68fdc26f22e19115182f96fb6f7335" + integrity sha512-EGQRjgDf5XP+Fm1MdZNRFiPd9e1vhl11BhjkwqkAsewic4eoz6fqXfj/Osz1hQy8xU+2dPPf/byQ/+nY3E02Zg== dependencies: - "@angular-devkit/core" "7.1.1" + "@angular-devkit/core" "7.3.1" enhanced-resolve "4.1.0" rxjs "6.3.3" - tree-kill "1.2.0" - webpack-sources "1.2.0" + tree-kill "1.2.1" + webpack-sources "1.3.0" "@ngx-loading-bar/core@3.0.0", "@ngx-loading-bar/core@^3.0.0": version "3.0.0" @@ -371,29 +373,34 @@ tslib "^1.9.0" yargs "10.0.3" -"@schematics/angular@7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.1.1.tgz#4ee17a17d221eaf48009db0b991766d1074d0b4f" - integrity sha512-jMaj8y3rNTQQXuH38uoWfAOmwYjtzqo1RelNfACnT54mfO/Dat+k7WasBLHWuvzvnN4/Ga3kXL7sJpkeMciiIg== +"@schematics/angular@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.1.tgz#6fcd7004210fa9305310c3109c084df5c5521776" + integrity sha512-0Ne8APPlTAjKg5CSZqluwCuW/5yPjr3ALCWzqwPxN0suE745usThtasBmqrjw0RMIt8nRqRgtg54Z7lCPO9ZFg== dependencies: - "@angular-devkit/core" "7.1.1" - "@angular-devkit/schematics" "7.1.1" - typescript "3.1.6" + "@angular-devkit/core" "7.3.1" + "@angular-devkit/schematics" "7.3.1" + typescript "3.2.4" -"@schematics/update@0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.11.1.tgz#5129a800043dc38ee1f1c879865e0df82ddac7ed" - integrity sha512-IzPXamoMpDb2eY2zSW4fPuuH+7RfJLte9XVzQM2y3ZTBhlJQFLqx7qJtOXdcXUboonC6o61KCayNDERFnDUdPg== +"@schematics/update@0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.1.tgz#481475aee18b4a9472a06512b2e4d6429af68231" + integrity sha512-EHOqolT/d/jRGuVTCUESLpk8JNpuaPlsVHfeK7Kdp/t0wSEnmtOelZX4+leS25lGXDaDUF3138ntjrZR4n6bGw== dependencies: - "@angular-devkit/core" "7.1.1" - "@angular-devkit/schematics" "7.1.1" + "@angular-devkit/core" "7.3.1" + "@angular-devkit/schematics" "7.3.1" "@yarnpkg/lockfile" "1.1.0" ini "1.3.5" - pacote "9.1.1" + pacote "9.4.0" rxjs "6.3.3" - semver "5.5.1" + semver "5.6.0" semver-intersect "1.4.0" +"@streamroot/videojs-hlsjs-plugin@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@streamroot/videojs-hlsjs-plugin/-/videojs-hlsjs-plugin-1.0.7.tgz#581aecdf6a966162b404c60bd3ab8264eb89d334" + integrity sha512-7oAIOhEFxkfLOYWDfg7Oh3+OrnoTElRvUE3Jblg2B+SHmnrw4YXQnAwYJ0AHjNIBKoHnQubzZGttLaHAFJVspQ== + "@types/bittorrent-protocol@*": version "2.2.2" resolved "https://registry.yarnpkg.com/@types/bittorrent-protocol/-/bittorrent-protocol-2.2.2.tgz#169e9633e1bd18e6b830d11cf42e611b1972cb83" @@ -406,6 +413,11 @@ resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-2.5.0.tgz#35cc282488de6f10af1d92902899a3b8ca3fbc47" integrity sha512-qjkHL3wF0JMHMqgm/kmL8Pf8rIiqvueEiZ0g6NVTcBX1WN46GWDr+V5z+gsHUeL0n8TfAmXnYmF7ajsxmBp4PQ== +"@types/hls.js@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@types/hls.js/-/hls.js-0.12.0.tgz#33f73e542201a766fa56792cb81fe9f97d7097ed" + integrity sha512-hJ7eJAQVEazAANK4Ay0YbXlZF36SDy9c8kcHTF7//77ylgV6hV/JrlwhVmobsSacr5aZcbw5MbZ2bSHbS36eOQ== + "@types/jasmine@*": version "3.3.1" resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.1.tgz#b6c4f356013364e98b583647c7b3b6de6fccd2cc" @@ -515,11 +527,25 @@ resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14" integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg== +"@types/source-list-map@*": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" + integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== + "@types/video.js@^7.2.5": version "7.2.5" resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-7.2.5.tgz#20896c81141d3517c3a89bb6eb97c6a191aa5d4c" integrity sha512-5WUDOme0q81d58nEqf7qnz7B2Jc4jlA7/MQGOgoqI5VE6oied0KUfk5x/XqPSZSAHNwDDREAkrcK8JXcB+iruQ== +"@types/webpack-sources@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92" + integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w== + dependencies: + "@types/node" "*" + "@types/source-list-map" "*" + source-map "^0.6.1" + "@types/webtorrent@^0.98.4": version "0.98.4" resolved "https://registry.yarnpkg.com/@types/webtorrent/-/webtorrent-0.98.4.tgz#cf8dbe22e3d5cf6915305f7f970b52bca01bf8b4" @@ -543,15 +569,6 @@ url-toolkit "^2.1.3" video.js "^6.8.0 || ^7.0.0" -"@webassemblyjs/ast@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a" - integrity sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew== - dependencies: - "@webassemblyjs/helper-module-context" "1.7.10" - "@webassemblyjs/helper-wasm-bytecode" "1.7.10" - "@webassemblyjs/wast-parser" "1.7.10" - "@webassemblyjs/ast@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" @@ -561,43 +578,21 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/wast-parser" "1.7.11" -"@webassemblyjs/floating-point-hex-parser@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9" - integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ== - "@webassemblyjs/floating-point-hex-parser@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== -"@webassemblyjs/helper-api-error@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198" - integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw== - "@webassemblyjs/helper-api-error@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== -"@webassemblyjs/helper-buffer@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b" - integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA== - "@webassemblyjs/helper-buffer@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== -"@webassemblyjs/helper-code-frame@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce" - integrity sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw== - dependencies: - "@webassemblyjs/wast-printer" "1.7.10" - "@webassemblyjs/helper-code-frame@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" @@ -605,46 +600,21 @@ dependencies: "@webassemblyjs/wast-printer" "1.7.11" -"@webassemblyjs/helper-fsm@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64" - integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA== - "@webassemblyjs/helper-fsm@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== -"@webassemblyjs/helper-module-context@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755" - integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ== - "@webassemblyjs/helper-module-context@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== -"@webassemblyjs/helper-wasm-bytecode@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0" - integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg== - "@webassemblyjs/helper-wasm-bytecode@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ== -"@webassemblyjs/helper-wasm-section@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e" - integrity sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/helper-buffer" "1.7.10" - "@webassemblyjs/helper-wasm-bytecode" "1.7.10" - "@webassemblyjs/wasm-gen" "1.7.10" - "@webassemblyjs/helper-wasm-section@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a" @@ -655,13 +625,6 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/wasm-gen" "1.7.11" -"@webassemblyjs/ieee754@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df" - integrity sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - "@webassemblyjs/ieee754@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" @@ -669,13 +632,6 @@ dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6" - integrity sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw== - dependencies: - "@xtuc/long" "4.2.1" - "@webassemblyjs/leb128@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" @@ -683,30 +639,11 @@ dependencies: "@xtuc/long" "4.2.1" -"@webassemblyjs/utf8@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a" - integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ== - "@webassemblyjs/utf8@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== -"@webassemblyjs/wasm-edit@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092" - integrity sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/helper-buffer" "1.7.10" - "@webassemblyjs/helper-wasm-bytecode" "1.7.10" - "@webassemblyjs/helper-wasm-section" "1.7.10" - "@webassemblyjs/wasm-gen" "1.7.10" - "@webassemblyjs/wasm-opt" "1.7.10" - "@webassemblyjs/wasm-parser" "1.7.10" - "@webassemblyjs/wast-printer" "1.7.10" - "@webassemblyjs/wasm-edit@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" @@ -721,17 +658,6 @@ "@webassemblyjs/wasm-parser" "1.7.11" "@webassemblyjs/wast-printer" "1.7.11" -"@webassemblyjs/wasm-gen@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174" - integrity sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/helper-wasm-bytecode" "1.7.10" - "@webassemblyjs/ieee754" "1.7.10" - "@webassemblyjs/leb128" "1.7.10" - "@webassemblyjs/utf8" "1.7.10" - "@webassemblyjs/wasm-gen@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" @@ -743,16 +669,6 @@ "@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/utf8" "1.7.11" -"@webassemblyjs/wasm-opt@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a" - integrity sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/helper-buffer" "1.7.10" - "@webassemblyjs/wasm-gen" "1.7.10" - "@webassemblyjs/wasm-parser" "1.7.10" - "@webassemblyjs/wasm-opt@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" @@ -763,18 +679,6 @@ "@webassemblyjs/wasm-gen" "1.7.11" "@webassemblyjs/wasm-parser" "1.7.11" -"@webassemblyjs/wasm-parser@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65" - integrity sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/helper-api-error" "1.7.10" - "@webassemblyjs/helper-wasm-bytecode" "1.7.10" - "@webassemblyjs/ieee754" "1.7.10" - "@webassemblyjs/leb128" "1.7.10" - "@webassemblyjs/utf8" "1.7.10" - "@webassemblyjs/wasm-parser@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" @@ -787,18 +691,6 @@ "@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/utf8" "1.7.11" -"@webassemblyjs/wast-parser@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264" - integrity sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/floating-point-hex-parser" "1.7.10" - "@webassemblyjs/helper-api-error" "1.7.10" - "@webassemblyjs/helper-code-frame" "1.7.10" - "@webassemblyjs/helper-fsm" "1.7.10" - "@xtuc/long" "4.2.1" - "@webassemblyjs/wast-parser@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" @@ -811,15 +703,6 @@ "@webassemblyjs/helper-fsm" "1.7.11" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-printer@1.7.10": - version "1.7.10" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b" - integrity sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/wast-parser" "1.7.10" - "@xtuc/long" "4.2.1" - "@webassemblyjs/wast-printer@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" @@ -862,11 +745,6 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -abbrev@1.0.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" - integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU= - accepts@~1.3.4, accepts@~1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" @@ -875,12 +753,10 @@ accepts@~1.3.4, accepts@~1.3.5: mime-types "~2.1.18" negotiator "0.6.1" -acorn-dynamic-import@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" - integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg== - dependencies: - acorn "^5.0.0" +acorn-dynamic-import@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" + integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== acorn-globals@^4.1.0: version "4.3.0" @@ -895,7 +771,7 @@ acorn-walk@^6.0.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw== -acorn@^5.0.0, acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3: +acorn@^5.5.3, acorn@^5.7.3: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== @@ -905,6 +781,11 @@ acorn@^6.0.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754" integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg== +acorn@^6.0.5: + version "6.1.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818" + integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw== + addr-to-ip-port@^1.0.1, addr-to-ip-port@^1.4.2: version "1.5.1" resolved "https://registry.yarnpkg.com/addr-to-ip-port/-/addr-to-ip-port-1.5.1.tgz#bfada13fd6aeeeac19f1e9f7d84b4bbab45e5208" @@ -953,10 +834,10 @@ ajv-keywords@^3.1.0: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo= -ajv@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" - integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg== +ajv@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96" + integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -1029,6 +910,11 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" + integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -1238,7 +1124,7 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg== -async@1.x, async@^1.5.2: +async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= @@ -1260,16 +1146,16 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e" - integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q== +autoprefixer@9.4.6: + version "9.4.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446" + integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw== dependencies: - browserslist "^4.3.3" - caniuse-lite "^1.0.30000898" + browserslist "^4.4.1" + caniuse-lite "^1.0.30000929" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.5" + postcss "^7.0.13" postcss-value-parser "^3.3.1" awesome-typescript-loader@5.2.1: @@ -1536,6 +1422,11 @@ big.js@^3.1.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q== +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + binary-extensions@^1.0.0: version "1.12.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" @@ -1588,7 +1479,7 @@ bittorrent-protocol@^3.0.0: unordered-array-remove "^1.0.2" xtend "^4.0.0" -bittorrent-tracker@^9.0.0: +bittorrent-tracker@^9.0.0, bittorrent-tracker@^9.10.1: version "9.10.1" resolved "https://registry.yarnpkg.com/bittorrent-tracker/-/bittorrent-tracker-9.10.1.tgz#5de14aac012a287af394d3cc9eda1ec6cc956f11" integrity sha512-n5zTL/g6Wt0rb2EnkiyiaGYhth7I/N0/xMqGUpvGX/7g1scDGBVPhJnXR8lfp3/OMj681fv40o4q/otECMtZSA== @@ -1653,7 +1544,7 @@ blocking-proxy@^1.0.0: dependencies: minimist "^1.2.0" -bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.2: +bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== @@ -1822,14 +1713,14 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.3.3: - version "4.3.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.5.tgz#1a917678acc07b55606748ea1adf9846ea8920f7" - integrity sha512-z9ZhGc3d9e/sJ9dIx5NFXkKoaiQTnrvrMsN3R1fGb1tkWWNSz12UewJn9TNxGo1l7J23h0MRaPmk7jfeTZYs1w== +browserslist@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062" + integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A== dependencies: - caniuse-lite "^1.0.30000912" - electron-to-chromium "^1.3.86" - node-releases "^1.0.5" + caniuse-lite "^1.0.30000929" + electron-to-chromium "^1.3.103" + node-releases "^1.1.3" browserstack@^1.5.1: version "1.5.1" @@ -1953,7 +1844,7 @@ cacache@^10.0.4: unique-filename "^1.1.0" y18n "^4.0.0" -cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0: +cacache@^11.0.1, cacache@^11.0.2: version "11.3.1" resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f" integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA== @@ -1973,6 +1864,26 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0: unique-filename "^1.1.0" y18n "^4.0.0" +cacache@^11.3.2: + version "11.3.2" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa" + integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg== + dependencies: + bluebird "^3.5.3" + chownr "^1.1.1" + figgy-pudding "^3.5.1" + glob "^7.1.3" + graceful-fs "^4.1.15" + lru-cache "^5.1.1" + mississippi "^3.0.0" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + promise-inflight "^1.0.1" + rimraf "^2.6.2" + ssri "^6.0.1" + unique-filename "^1.1.1" + y18n "^4.0.0" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -2041,10 +1952,10 @@ camelcase@^5.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== -caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000912: - version "1.0.30000914" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000914.tgz#f802b4667c24d0255f54a95818dcf8e1aa41f624" - integrity sha512-qqj0CL1xANgg6iDOybiPTIxtsmAnfIky9mBC35qgWrnK4WwmhqfpmkDYMYgwXJ8LRZ3/2jXlCntulO8mBaAgSg== +caniuse-lite@^1.0.30000929: + version "1.0.30000935" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000935.tgz#d1b59df00b46f4921bb84a8a34c1d172b346df59" + integrity sha512-1Y2uJ5y56qDt3jsDTdBHL1OqiImzjoQcBG6Yl3Qizq8mcc2SgCFpi+ZwLLqkztYnk9l87IYqRlNBnPSOTbFkXQ== canonical-path@1.0.0: version "1.0.0" @@ -2083,6 +1994,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -2320,11 +2240,6 @@ commander@^2.12.1, commander@^2.18.0, commander@^2.9.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== -commander@~2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" - integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA== - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -2473,10 +2388,10 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@4.5.4: - version "4.5.4" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27" - integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ== +copy-webpack-plugin@4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae" + integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA== dependencies: cacache "^10.0.4" find-cache-dir "^1.0.0" @@ -2774,6 +2689,13 @@ debug@^3.1.0, debug@^3.2.5: dependencies: ms "^2.1.1" +debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2944,7 +2866,7 @@ detect-newline@^2.1.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= -detect-node@^2.0.3: +detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== @@ -3141,10 +3063,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== -electron-to-chromium@^1.3.86: - version "1.3.88" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.88.tgz#f36ab32634f49ef2b0fdc1e82e2d1cc17feb29e7" - integrity sha512-UPV4NuQMKeUh1S0OWRvwg0PI8ASHN9kBC8yDTk1ROXLC85W5GnhTRu/MZu3Teqx3JjlQYuckuHYXSUSgtb3J+A== +electron-to-chromium@^1.3.103: + version "1.3.113" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9" + integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g== elliptic@^6.0.0: version "6.4.1" @@ -3359,18 +3281,6 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@1.8.x: - version "1.8.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" - integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg= - dependencies: - esprima "^2.7.1" - estraverse "^1.9.1" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.2.0" - escodegen@^1.9.1: version "1.11.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589" @@ -3391,11 +3301,6 @@ eslint-scope@^4.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -esprima@2.7.x, esprima@^2.7.1: - version "2.7.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" - integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= - esprima@^3.1.3, esprima@~3.1.0: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -3413,11 +3318,6 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^1.9.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" - integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q= - estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -3438,7 +3338,7 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -eventemitter3@^3.0.0: +eventemitter3@3.1.0, eventemitter3@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA== @@ -3448,6 +3348,11 @@ events@^1.0.0: resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= +events@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88" + integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA== + eventsource@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" @@ -3721,7 +3626,15 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@2.0.0, file-loader@^2.0.0: +file-loader@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa" + integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw== + dependencies: + loader-utils "^1.0.2" + schema-utils "^1.0.0" + +file-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde" integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ== @@ -4043,7 +3956,7 @@ genfun@^5.0.0: resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== -get-browser-rtc@^1.0.0: +get-browser-rtc@^1.0.0, get-browser-rtc@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9" integrity sha1-u81AyEUaftTvXDc7gWmkCd0dEdk= @@ -4146,17 +4059,6 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo once "^1.3.0" path-is-absolute "^1.0.0" -glob@^5.0.15: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - global-modules-path@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz#e541f4c800a1a8514a990477b267ac67525b9931" @@ -4224,7 +4126,7 @@ globule@^1.0.0: lodash "~4.17.10" minimatch "~3.0.2" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== @@ -4242,12 +4144,12 @@ gzip-size@^5.0.0: duplexer "^0.1.1" pify "^3.0.0" -handle-thing@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" - integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ= +handle-thing@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" + integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== -handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.3: +handlebars@^4.0.11, handlebars@^4.0.3: version "4.0.12" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5" integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA== @@ -4369,6 +4271,14 @@ he@1.2.x: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +hls.js@^0.12.2: + version "0.12.2" + resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.12.2.tgz#64a969a78cc25991ed5de19357b1dc3f178ac23b" + integrity sha512-lQBSXggw9OzEuaUllUBoSxPcf7neFgnEiDRfCdCNdIPtUeV7vXZ0OeASx6EWtZTBiqSSPigoOX1Y+AR5dA1Feg== + dependencies: + eventemitter3 "3.1.0" + url-toolkit "^2.1.6" + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -4701,10 +4611,10 @@ ini@1.3.5, ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -inquirer@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8" - integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg== +inquirer@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52" + integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg== dependencies: ansi-escapes "^3.0.0" chalk "^2.0.0" @@ -4717,7 +4627,7 @@ inquirer@6.2.0: run-async "^2.2.0" rxjs "^6.1.0" string-width "^2.1.0" - strip-ansi "^4.0.0" + strip-ansi "^5.0.0" through "^2.3.6" internal-ip@^3.0.1: @@ -5266,26 +5176,6 @@ istanbul-reports@^2.0.1: dependencies: handlebars "^4.0.11" -istanbul@0.4.5: - version "0.4.5" - resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b" - integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs= - dependencies: - abbrev "1.0.x" - async "1.x" - escodegen "1.8.x" - esprima "2.7.x" - glob "^5.0.15" - handlebars "^4.0.1" - js-yaml "3.x" - mkdirp "0.5.x" - nopt "3.x" - once "1.x" - resolve "1.1.x" - supports-color "^3.1.0" - which "^1.1.1" - wordwrap "^1.0.0" - jasmine-core@^3.1.0: version "3.3.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e" @@ -5668,7 +5558,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0: +js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0: version "3.12.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A== @@ -5782,6 +5672,13 @@ json5@^0.5.0, json5@^0.5.1: resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + dependencies: + minimist "^1.2.0" + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -5994,10 +5891,10 @@ less-loader@4.1.0: loader-utils "^1.1.0" pify "^3.0.0" -less@3.8.1: - version "3.8.1" - resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d" - integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q== +less@3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474" + integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w== dependencies: clone "^2.1.2" optionalDependencies: @@ -6023,11 +5920,12 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -license-webpack-plugin@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687" - integrity sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA== +license-webpack-plugin@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f" + integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A== dependencies: + "@types/webpack-sources" "^0.1.5" webpack-sources "^1.2.0" lie@~3.1.0: @@ -6090,14 +5988,14 @@ loader-runner@^2.3.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979" integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw== -loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.4, loader-utils@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" - integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0= +loader-utils@1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" + integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== dependencies: - big.js "^3.1.3" + big.js "^5.2.2" emojis-list "^2.0.0" - json5 "^0.5.0" + json5 "^1.0.1" loader-utils@^0.2.16: version "0.2.17" @@ -6109,6 +6007,15 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" +loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.4, loader-utils@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" + integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0= + dependencies: + big.js "^3.1.3" + emojis-list "^2.0.0" + json5 "^0.5.0" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -6239,6 +6146,13 @@ lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru@^3.0.0, lru@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lru/-/lru-3.1.0.tgz#ea7fb8546d83733396a13091d76cfeb4c06837d5" @@ -6251,6 +6165,13 @@ m3u8-parser@4.2.0: resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.2.0.tgz#c8e0785fd17f741f4408b49466889274a9e36447" integrity sha512-LVHw0U6IPJjwk9i9f7Xe26NqaUHTNlIt4SSWoEfYFROeVKHN6MIjOhbRheI3dg8Jbq5WCuMFQ0QU3EgZpmzFPg== +m3u8-parser@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.3.0.tgz#4b4e988f87b6d8b2401d209a1d17798285a9da04" + integrity sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA== + dependencies: + global "^4.3.2" + magic-string@^0.25.0: version "0.25.1" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e" @@ -6532,10 +6453,10 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -mini-css-extract-plugin@0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d" - integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ== +mini-css-extract-plugin@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0" + integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw== dependencies: loader-utils "^1.1.0" schema-utils "^1.0.0" @@ -6551,7 +6472,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -6943,14 +6864,39 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" -node-releases@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.5.tgz#a641adcc968b039a27345d92ef10b093e5cbd41d" - integrity sha512-Ky7q0BO1BBkG/rQz6PkEZ59rwo+aSfhczHP1wwq8IowoVdN/FpiP7qp0XW0P2+BVCWe5fQUBozdbVd54q1RbCQ== +node-releases@^1.1.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.7.tgz#b09a10394d0ed8f7778f72bb861dde68b146303b" + integrity sha512-bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA== dependencies: semver "^5.3.0" -node-sass@4.10.0, node-sass@^4.9.3: +node-sass@4.11.0: + version "4.11.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a" + integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA== + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash.assign "^4.2.0" + lodash.clonedeep "^4.3.2" + lodash.mergewith "^4.6.0" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.10.0" + node-gyp "^3.8.0" + npmlog "^4.0.0" + request "^2.88.0" + sass-graph "^2.2.4" + stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" + +node-sass@^4.9.3: version "4.10.0" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4" integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q== @@ -6975,7 +6921,7 @@ node-sass@4.10.0, node-sass@^4.9.3: stdout-stream "^1.4.0" "true-case-path" "^1.0.2" -"nopt@2 || 3", nopt@3.x: +"nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= @@ -7022,7 +6968,7 @@ npm-font-source-sans-pro@^1.0.2: resolved "https://registry.yarnpkg.com/npm-font-source-sans-pro/-/npm-font-source-sans-pro-1.0.2.tgz#c55c8ae368eebdbcaca65425a0d7e1f9a192a03e" integrity sha1-xVyK42juvbysplQloNfh+aGSoD4= -npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: +npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1" integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA== @@ -7040,7 +6986,7 @@ npm-packlist@^1.1.12, npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" -npm-pick-manifest@^2.1.0: +npm-pick-manifest@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40" integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA== @@ -7174,7 +7120,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -obuf@^1.0.0, obuf@^1.1.1: +obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== @@ -7191,7 +7137,7 @@ on-headers@~1.0.1: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c= -once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0: +once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -7210,14 +7156,7 @@ opener@^1.5.1: resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== -opn@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c" - integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g== - dependencies: - is-wsl "^1.1.0" - -opn@^5.1.0: +opn@5.4.0, opn@^5.1.0: version "5.4.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035" integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw== @@ -7357,6 +7296,26 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== +p2p-media-loader-core@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/p2p-media-loader-core/-/p2p-media-loader-core-0.4.0.tgz#767d56785545bc9c0d8c1a04eb7b67a33e40d0c8" + integrity sha512-llcFqEDs19o916g2OSIPHPjZweO5caHUm/7P18Qu+qb3swYQYSPNwMLoHnpXROHiH5I+00K8w5enz31oUwiCgA== + dependencies: + bittorrent-tracker "^9.10.1" + debug "^4.1.1" + events "^3.0.0" + get-browser-rtc "^1.0.2" + sha.js "^2.4.11" + +p2p-media-loader-hlsjs@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/p2p-media-loader-hlsjs/-/p2p-media-loader-hlsjs-0.4.0.tgz#1b90c88580503d4c3d8017c813abe41803b613ed" + integrity sha512-IWRs/aGasKD//+dtQkYWAjD/cQx3LMaLkMn0EzLhLpeBj4SLNjlbwOPlbx36M4i39X04Y3WZe9YUeIciId3G5Q== + dependencies: + events "^3.0.0" + m3u8-parser "^4.3.0" + p2p-media-loader-core "^0.4.0" + package-json-versionify@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/package-json-versionify/-/package-json-versionify-1.0.4.tgz#5860587a944873a6b7e6d26e8e51ffb22315bf17" @@ -7364,17 +7323,17 @@ package-json-versionify@^1.0.2: dependencies: browserify-package-json "^1.0.0" -pacote@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b" - integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA== +pacote@9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807" + integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w== dependencies: - bluebird "^3.5.2" - cacache "^11.2.0" + bluebird "^3.5.3" + cacache "^11.3.2" figgy-pudding "^3.5.1" get-stream "^4.1.0" glob "^7.1.3" - lru-cache "^4.1.3" + lru-cache "^5.1.1" make-fetch-happen "^4.0.1" minimatch "^3.0.4" minipass "^2.3.5" @@ -7383,7 +7342,7 @@ pacote@9.1.1: normalize-package-data "^2.4.0" npm-package-arg "^6.1.0" npm-packlist "^1.1.12" - npm-pick-manifest "^2.1.0" + npm-pick-manifest "^2.2.3" npm-registry-fetch "^3.8.0" osenv "^0.1.5" promise-inflight "^1.0.1" @@ -7393,7 +7352,7 @@ pacote@9.1.1: safe-buffer "^5.1.2" semver "^5.6.0" ssri "^6.0.1" - tar "^4.4.6" + tar "^4.4.8" unique-filename "^1.1.1" which "^1.3.1" @@ -7658,15 +7617,6 @@ pngjs@^2.3.1: resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-2.3.1.tgz#11d1e12b9cb64d63e30c143a330f4c1f567da85f" integrity sha1-EdHhK5y2TWPjDBQ6Mw9MH1Z9qF8= -portfinder@1.0.17: - version "1.0.17" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a" - integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ== - dependencies: - async "^1.5.2" - debug "^2.2.0" - mkdirp "0.5.x" - portfinder@^1.0.9: version "1.0.20" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a" @@ -7681,10 +7631,10 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss-import@12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5" - integrity sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ== +postcss-import@12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" + integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== dependencies: postcss "^7.0.1" postcss-value-parser "^3.2.3" @@ -7745,14 +7695,14 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss@7.0.5: - version "7.0.5" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55" - integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ== +postcss@7.0.14, postcss@^7.0.13: + version "7.0.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5" + integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg== dependencies: - chalk "^2.4.1" + chalk "^2.4.2" source-map "^0.6.1" - supports-color "^5.5.0" + supports-color "^6.1.0" postcss@^6.0.1, postcss@^6.0.23: version "6.0.23" @@ -7763,7 +7713,7 @@ postcss@^6.0.1, postcss@^6.0.23: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5: +postcss@^7.0.0, postcss@^7.0.1: version "7.0.6" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.6.tgz#6dcaa1e999cdd4a255dcd7d4d9547f4ca010cdc2" integrity sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug== @@ -7953,21 +7903,11 @@ pumpify@^1.3.3: inherits "^2.0.3" pump "^2.0.0" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - -punycode@^1.2.4, punycode@^1.4.1: +punycode@1.3.2, punycode@^1.2.4, punycode@^1.4.1, punycode@^2.1.0, punycode@^2.1.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - purify-css@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/purify-css/-/purify-css-1.2.5.tgz#c4b9ec90735765f3e247ba6a3b49f132f3482500" @@ -8098,7 +8038,15 @@ raw-body@2.3.3: iconv-lite "0.4.23" unpipe "1.0.0" -raw-loader@0.5.1, raw-loader@^0.5.1: +raw-loader@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405" + integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA== + dependencies: + loader-utils "^1.1.0" + schema-utils "^1.0.0" + +raw-loader@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" integrity sha1-DD0L6u2KAclm2Xh793goElKpeao= @@ -8174,7 +8122,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.2, readable-stream@^2.3.3, readable-stream@^2.3.4, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.2, readable-stream@^2.3.3, readable-stream@^2.3.4, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -8453,7 +8401,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@1.1.7, resolve@1.1.x: +resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= @@ -8745,16 +8693,11 @@ semver-intersect@1.4.0: dependencies: semver "^5.0.0" -"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@5.6.0, semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477" - integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw== - semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -8842,7 +8785,7 @@ setprototypeof@1.1.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== -sha.js@^2.4.0, sha.js@^2.4.8: +sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== @@ -9118,10 +9061,10 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@0.5.9, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.6: - version "0.5.9" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" - integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA== +source-map-support@0.5.10, source-map-support@~0.5.9: + version "0.5.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c" + integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -9133,6 +9076,14 @@ source-map-support@^0.4.15, source-map-support@~0.4.0: dependencies: source-map "^0.5.6" +source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.6: + version "0.5.9" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" + integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -9172,13 +9123,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" - integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50= - dependencies: - amdefine ">=0.0.4" - sourcemap-codec@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" @@ -9210,35 +9154,33 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2" integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg== -spdy-transport@^2.0.18: - version "2.1.1" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.1.tgz#c54815d73858aadd06ce63001e7d25fa6441623b" - integrity sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q== +spdy-transport@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== dependencies: - debug "^2.6.8" - detect-node "^2.0.3" + debug "^4.1.0" + detect-node "^2.0.4" hpack.js "^2.1.6" - obuf "^1.1.1" - readable-stream "^2.2.9" - safe-buffer "^5.0.1" - wbuf "^1.7.2" + obuf "^1.1.2" + readable-stream "^3.0.6" + wbuf "^1.7.3" -spdy@^3.4.1: - version "3.4.7" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc" - integrity sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw= +spdy@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52" + integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q== dependencies: - debug "^2.6.8" - handle-thing "^1.2.5" + debug "^4.1.0" + handle-thing "^2.0.0" http-deceiver "^1.2.7" - safe-buffer "^5.0.1" select-hose "^2.0.0" - spdy-transport "^2.0.18" + spdy-transport "^3.0.0" -speed-measure-webpack-plugin@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48" - integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw== +speed-measure-webpack-plugin@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa" + integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw== dependencies: chalk "^2.0.1" @@ -9494,6 +9436,13 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f" + integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow== + dependencies: + ansi-regex "^4.0.0" + strip-bom@3.0.0, strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -9557,7 +9506,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^3.1.0, supports-color@^3.1.2: +supports-color@^3.1.2: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= @@ -9571,6 +9520,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-co dependencies: has-flag "^3.0.0" +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + symbol-observable@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -9595,7 +9551,7 @@ tar@^2.0.0: fstream "^1.0.2" inherits "2" -tar@^4, tar@^4.4.6: +tar@^4, tar@^4.4.8: version "4.4.8" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== @@ -9608,7 +9564,21 @@ tar@^4, tar@^4.4.6: safe-buffer "^5.1.2" yallist "^3.0.2" -terser-webpack-plugin@1.1.0, terser-webpack-plugin@^1.1.0: +terser-webpack-plugin@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9" + integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg== + dependencies: + cacache "^11.0.2" + find-cache-dir "^2.0.0" + schema-utils "^1.0.0" + serialize-javascript "^1.4.0" + source-map "^0.6.1" + terser "^3.16.1" + webpack-sources "^1.1.0" + worker-farm "^1.5.2" + +terser-webpack-plugin@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528" integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA== @@ -9622,6 +9592,15 @@ terser-webpack-plugin@1.1.0, terser-webpack-plugin@^1.1.0: webpack-sources "^1.1.0" worker-farm "^1.5.2" +terser@^3.16.1: + version "3.16.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493" + integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow== + dependencies: + commander "~2.17.1" + source-map "~0.6.1" + source-map-support "~0.5.9" + terser@^3.8.1: version "3.11.0" resolved "https://registry.yarnpkg.com/terser/-/terser-3.11.0.tgz#60782893e1f4d6788acc696351f40636d0e37af0" @@ -9784,10 +9763,10 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -tree-kill@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" - integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg== +tree-kill@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a" + integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q== trim-newlines@^1.0.0: version "1.0.0" @@ -9953,19 +9932,16 @@ typescript@3.1.6: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68" integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA== +typescript@3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d" + integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376" integrity sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg== -uglify-es@^3.3.4: - version "3.3.9" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" - integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ== - dependencies: - commander "~2.13.0" - source-map "~0.6.1" - uglify-js@3.4.x, uglify-js@^3.0.6, uglify-js@^3.1.4: version "3.4.9" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3" @@ -9974,20 +9950,6 @@ uglify-js@3.4.x, uglify-js@^3.0.6, uglify-js@^3.1.4: commander "~2.17.1" source-map "~0.6.1" -uglifyjs-webpack-plugin@^1.2.4: - version "1.3.0" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de" - integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw== - dependencies: - cacache "^10.0.4" - find-cache-dir "^1.0.0" - schema-utils "^0.4.5" - serialize-javascript "^1.4.0" - source-map "^0.6.1" - uglify-es "^3.3.4" - webpack-sources "^1.1.0" - worker-farm "^1.5.2" - uint64be@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/uint64be/-/uint64be-2.0.2.tgz#ef4a179752fe8f9ddaa29544ecfc13490031e8e5" @@ -10082,7 +10044,7 @@ url-parse@^1.4.3: querystringify "^2.0.0" requires-port "^1.0.0" -url-toolkit@^2.1.1, url-toolkit@^2.1.3: +url-toolkit@^2.1.1, url-toolkit@^2.1.3, url-toolkit@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.6.tgz#6d03246499e519aad224c44044a4ae20544154f2" integrity sha512-UaZ2+50am4HwrV2crR/JAf63Q4VvPYphe63WGeoJxeu8gmOm0qxPt+KsukfakPNrX9aymGNEkkaoICwn+OuvBw== @@ -10233,6 +10195,14 @@ videojs-contextmenu-ui@^5.0.0: global "^4.3.2" video.js "^6 || ^7" +videojs-contrib-quality-levels@^2.0.9: + version "2.0.9" + resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.0.9.tgz#b5d533d5092a6fc7d29eae1b43e4597d89bd527b" + integrity sha512-HJeaJJQdSufi9Y5T7jlyyhkeq+mWPCog86q6ypoTi66boBMMJTo2abiOSHS9KaOGAJjH72gfvrjVY5FRdjlxYA== + dependencies: + global "^4.3.2" + video.js "^6 || ^7" + videojs-dock@^2.0.2: version "2.1.4" resolved "https://registry.yarnpkg.com/videojs-dock/-/videojs-dock-2.1.4.tgz#0ebd198b5d48990e3523fdc87dbfdb9fe96f804c" @@ -10315,7 +10285,7 @@ watchpack@^1.5.0: graceful-fs "^4.1.2" neo-async "^2.5.0" -wbuf@^1.1.0, wbuf@^1.7.2: +wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== @@ -10404,10 +10374,20 @@ webpack-dev-middleware@3.4.0: range-parser "^1.0.3" webpack-log "^2.0.0" -webpack-dev-server@3.1.10: - version "3.1.10" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b" - integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww== +webpack-dev-middleware@3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88" + integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw== + dependencies: + memory-fs "~0.4.1" + mime "^2.3.1" + range-parser "^1.0.3" + webpack-log "^2.0.0" + +webpack-dev-server@3.1.14: + version "3.1.14" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469" + integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -10428,12 +10408,14 @@ webpack-dev-server@3.1.10: portfinder "^1.0.9" schema-utils "^1.0.0" selfsigned "^1.9.1" + semver "^5.6.0" serve-index "^1.7.2" sockjs "0.3.19" sockjs-client "1.3.0" - spdy "^3.4.1" + spdy "^4.0.0" strip-ansi "^3.0.0" supports-color "^5.1.0" + url "^0.11.0" webpack-dev-middleware "3.4.0" webpack-log "^2.0.0" yargs "12.0.2" @@ -10456,21 +10438,13 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b" - integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ== +webpack-merge@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4" + integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw== dependencies: lodash "^4.17.5" -webpack-sources@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2" - integrity sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85" @@ -10494,47 +10468,17 @@ webpack-subresource-integrity@1.1.0-rc.6: dependencies: webpack-core "^0.6.8" -webpack@4.23.1: - version "4.23.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239" - integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg== - dependencies: - "@webassemblyjs/ast" "1.7.10" - "@webassemblyjs/helper-module-context" "1.7.10" - "@webassemblyjs/wasm-edit" "1.7.10" - "@webassemblyjs/wasm-parser" "1.7.10" - acorn "^5.6.2" - acorn-dynamic-import "^3.0.0" - ajv "^6.1.0" - ajv-keywords "^3.1.0" - chrome-trace-event "^1.0.0" - enhanced-resolve "^4.1.0" - eslint-scope "^4.0.0" - json-parse-better-errors "^1.0.2" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - micromatch "^3.1.8" - mkdirp "~0.5.0" - neo-async "^2.5.0" - node-libs-browser "^2.0.0" - schema-utils "^0.4.4" - tapable "^1.1.0" - uglifyjs-webpack-plugin "^1.2.4" - watchpack "^1.5.0" - webpack-sources "^1.3.0" - -webpack@^4.17.1: - version "4.26.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39" - integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug== +webpack@4.29.0: + version "4.29.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750" + integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w== dependencies: "@webassemblyjs/ast" "1.7.11" "@webassemblyjs/helper-module-context" "1.7.11" "@webassemblyjs/wasm-edit" "1.7.11" "@webassemblyjs/wasm-parser" "1.7.11" - acorn "^5.6.2" - acorn-dynamic-import "^3.0.0" + acorn "^6.0.5" + acorn-dynamic-import "^4.0.0" ajv "^6.1.0" ajv-keywords "^3.1.0" chrome-trace-event "^1.0.0" @@ -10662,7 +10606,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1: +which@1, which@^1.2.1, which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -10676,16 +10620,16 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" -wordwrap@^1.0.0, wordwrap@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= +wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + worker-farm@^1.5.2: version "1.6.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0" diff --git a/config/default.yaml b/config/default.yaml index e16b8c352..5a83b271e 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -48,6 +48,7 @@ storage: tmp: 'storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... avatars: 'storage/avatars/' videos: 'storage/videos/' + playlists: 'storage/playlists/' redundancy: 'storage/redundancy/' logs: 'storage/logs/' previews: 'storage/previews/' @@ -138,6 +139,15 @@ transcoding: 480p: false 720p: false 1080p: false + # /!\ EXPERIMENTAL /!\ + # /!\ Requires ffmpeg >= 3.4 + # Generate HLS playlist/segments. Better playback than with WebTorrent: + # * Resolution change is smoother + # * Faster playback in particular with long videos + # * More stable playback (less bugs/infinite loading) + # /!\ Multiply videos storage by two /!\ + hls: + enabled: false import: # Add ability for your users to import remote videos (from YouTube, torrent...) diff --git a/config/production.yaml.example b/config/production.yaml.example index 661eac0d5..c54e1a516 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -49,6 +49,7 @@ storage: tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... avatars: '/var/www/peertube/storage/avatars/' videos: '/var/www/peertube/storage/videos/' + playlists: '/var/www/peertube/storage/playlists/' redundancy: '/var/www/peertube/storage/videos/' logs: '/var/www/peertube/storage/logs/' previews: '/var/www/peertube/storage/previews/' @@ -151,6 +152,15 @@ transcoding: 480p: false 720p: false 1080p: false + # /!\ EXPERIMENTAL /!\ + # /!\ Requires ffmpeg >= 3.4 + # Generate HLS playlist/segments. Better playback than with WebTorrent: + # * Resolution change is smoother + # * Faster playback in particular with long videos + # * More stable playback (less bugs/infinite loading) + # /!\ Multiply videos storage by two /!\ + hls: + enabled: false import: # Add ability for your users to import remote videos (from YouTube, torrent...) diff --git a/config/test-1.yaml b/config/test-1.yaml index 8f4f66d2a..fb69818f3 100644 --- a/config/test-1.yaml +++ b/config/test-1.yaml @@ -13,6 +13,7 @@ storage: tmp: 'test1/tmp/' avatars: 'test1/avatars/' videos: 'test1/videos/' + playlists: 'test1/playlists/' redundancy: 'test1/redundancy/' logs: 'test1/logs/' previews: 'test1/previews/' diff --git a/config/test-2.yaml b/config/test-2.yaml index b6d319394..5caddaaa8 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml @@ -13,6 +13,7 @@ storage: tmp: 'test2/tmp/' avatars: 'test2/avatars/' videos: 'test2/videos/' + playlists: 'test2/playlists/' redundancy: 'test2/redundancy/' logs: 'test2/logs/' previews: 'test2/previews/' diff --git a/config/test-3.yaml b/config/test-3.yaml index 934401eb0..fac7ebee1 100644 --- a/config/test-3.yaml +++ b/config/test-3.yaml @@ -13,6 +13,7 @@ storage: tmp: 'test3/tmp/' avatars: 'test3/avatars/' videos: 'test3/videos/' + playlists: 'test3/playlists/' redundancy: 'test3/redundancy/' logs: 'test3/logs/' previews: 'test3/previews/' diff --git a/config/test-4.yaml b/config/test-4.yaml index ee99b250b..33033773a 100644 --- a/config/test-4.yaml +++ b/config/test-4.yaml @@ -13,6 +13,7 @@ storage: tmp: 'test4/tmp/' avatars: 'test4/avatars/' videos: 'test4/videos/' + playlists: 'test4/playlists/' redundancy: 'test4/redundancy/' logs: 'test4/logs/' previews: 'test4/previews/' diff --git a/config/test-5.yaml b/config/test-5.yaml index e2662bdd9..d365b6f2b 100644 --- a/config/test-5.yaml +++ b/config/test-5.yaml @@ -13,6 +13,7 @@ storage: tmp: 'test5/tmp/' avatars: 'test5/avatars/' videos: 'test5/videos/' + playlists: 'test5/playlists/' redundancy: 'test5/redundancy/' logs: 'test5/logs/' previews: 'test5/previews/' diff --git a/config/test-6.yaml b/config/test-6.yaml index ad39c6a9f..44541c003 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml @@ -13,6 +13,7 @@ storage: tmp: 'test6/tmp/' avatars: 'test6/avatars/' videos: 'test6/videos/' + playlists: 'test6/playlists/' redundancy: 'test6/redundancy/' logs: 'test6/logs/' previews: 'test6/previews/' diff --git a/config/test.yaml b/config/test.yaml index aba5dd73c..682530840 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -62,6 +62,8 @@ transcoding: 480p: true 720p: true 1080p: true + hls: + enabled: true import: videos: diff --git a/package.json b/package.json index ea3f88e24..0cf39c7ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "peertube", "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", - "version": "1.1.0", + "version": "1.2.0", "private": true, "licence": "AGPLv3", "engines": { diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh index 9b8fddac6..b4675c57f 100755 --- a/scripts/dev/server.sh +++ b/scripts/dev/server.sh @@ -4,7 +4,7 @@ set -eu if [ ! -f "./client/dist/en_US/index.html" ]; then echo "client/dist/en_US/index.html does not exist, compile client files..." - npm run build:client + npm run build:client -- --light fi npm run watch:server diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts index 9824bc2f5..96110307a 100755 --- a/scripts/generate-code-contributors.ts +++ b/scripts/generate-code-contributors.ts @@ -41,7 +41,7 @@ async function run () { } function get (url: string, headers: any = {}) { - return doRequest({ + return doRequest({ uri: url, json: true, headers: Object.assign(headers, { diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts index eed3182a6..664207e1c 100755 --- a/scripts/i18n/create-custom-files.ts +++ b/scripts/i18n/create-custom-files.ts @@ -23,12 +23,15 @@ const playerKeys = { 'Speed': 'Speed', 'Subtitles/CC': 'Subtitles/CC', 'peers': 'peers', + 'peer': 'peer', 'Go to the video page': 'Go to the video page', 'Settings': 'Settings', 'Uses P2P, others may know you are watching this video.': 'Uses P2P, others may know you are watching this video.', 'Copy the video URL': 'Copy the video URL', 'Copy the video URL at the current time': 'Copy the video URL at the current time', - 'Copy embed code': 'Copy embed code' + 'Copy embed code': 'Copy embed code', + 'Total downloaded: ': 'Total downloaded: ', + 'Total uploaded: ': 'Total uploaded: ' } const playerTranslations = { target: join(__dirname, '../../../client/src/locale/source/player_en_US.xml'), @@ -42,6 +45,12 @@ values(VIDEO_CATEGORIES) .concat(values(VIDEO_PRIVACIES)) .concat(values(VIDEO_STATES)) .concat(values(VIDEO_IMPORT_STATES)) + .concat([ + 'This video does not exist.', + 'We cannot fetch the video. Please try again later.', + 'Sorry', + 'This video is not available because the remote instance is not responding.' + ]) .forEach(v => serverKeys[v] = v) // More keys @@ -103,4 +112,4 @@ function saveToXliffFile (jsonTranslations: TranslationType, cb: Function) { function handleError (err: any) { console.error(err) process.exit(-1) -} \ No newline at end of file +} diff --git a/scripts/update-host.ts b/scripts/update-host.ts index 422a3c9a7..64eba867a 100755 --- a/scripts/update-host.ts +++ b/scripts/update-host.ts @@ -13,6 +13,7 @@ import { VideoCommentModel } from '../server/models/video/video-comment' import { getServerActor } from '../server/helpers/utils' import { AccountModel } from '../server/models/account/account' import { VideoChannelModel } from '../server/models/video/video-channel' +import { VideoStreamingPlaylistModel } from '../server/models/video/video-streaming-playlist' run() .then(() => process.exit(0)) @@ -109,11 +110,9 @@ async function run () { console.log('Updating video and torrent files.') - const videos = await VideoModel.list() + const videos = await VideoModel.listLocal() for (const video of videos) { - if (video.isOwned() === false) continue - - console.log('Updated video ' + video.uuid) + console.log('Updating video ' + video.uuid) video.url = getVideoActivityPubUrl(video) await video.save() @@ -122,5 +121,12 @@ async function run () { console.log('Updating torrent file %s of video %s.', file.resolution, video.uuid) await video.createTorrentAndSetInfoHash(file) } + + for (const playlist of video.VideoStreamingPlaylists) { + playlist.playlistUrl = CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid) + playlist.segmentsSha256Url = CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid) + + await playlist.save() + } } } diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 1a4e28dc8..31c0a5fbd 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts @@ -3,22 +3,18 @@ import * as express from 'express' import { VideoPrivacy, VideoRateType } from '../../../shared/models/videos' import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub' import { CONFIG, ROUTE_CACHE_LIFETIME } from '../../initializers' -import { buildAnnounceWithVideoAudience, buildDislikeActivity, buildLikeActivity } from '../../lib/activitypub/send' +import { buildAnnounceWithVideoAudience, buildLikeActivity } from '../../lib/activitypub/send' import { audiencify, getAudience } from '../../lib/activitypub/audience' import { buildCreateActivity } from '../../lib/activitypub/send/send-create' import { asyncMiddleware, - videosShareValidator, executeIfActivityPub, localAccountValidator, localVideoChannelValidator, - videosCustomGetValidator + videosCustomGetValidator, + videosShareValidator } from '../../middlewares' -import { - getAccountVideoRateValidator, - videoCommentGetValidator, - videosGetValidator -} from '../../middlewares/validators' +import { getAccountVideoRateValidator, videoCommentGetValidator, videosGetValidator } from '../../middlewares/validators' import { AccountModel } from '../../models/account/account' import { ActorModel } from '../../models/activitypub/actor' import { ActorFollowModel } from '../../models/activitypub/actor-follow' @@ -37,9 +33,10 @@ import { getVideoSharesActivityPubUrl } from '../../lib/activitypub' import { VideoCaptionModel } from '../../models/video/video-caption' -import { videoRedundancyGetValidator } from '../../middlewares/validators/redundancy' +import { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator } from '../../middlewares/validators/redundancy' import { getServerActor } from '../../helpers/utils' import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy' +import { buildDislikeActivity } from '../../lib/activitypub/send/send-dislike' const activityPubClientRouter = express.Router() @@ -66,11 +63,11 @@ activityPubClientRouter.get('/accounts?/:name/dislikes/:videoId', activityPubClientRouter.get('/videos/watch/:id', executeIfActivityPub(asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS))), - executeIfActivityPub(asyncMiddleware(videosGetValidator)), + executeIfActivityPub(asyncMiddleware(videosCustomGetValidator('only-video-with-rights'))), executeIfActivityPub(asyncMiddleware(videoController)) ) activityPubClientRouter.get('/videos/watch/:id/activity', - executeIfActivityPub(asyncMiddleware(videosGetValidator)), + executeIfActivityPub(asyncMiddleware(videosCustomGetValidator('only-video-with-rights'))), executeIfActivityPub(asyncMiddleware(videoController)) ) activityPubClientRouter.get('/videos/watch/:id/announces', @@ -116,7 +113,11 @@ activityPubClientRouter.get('/video-channels/:name/following', ) activityPubClientRouter.get('/redundancy/videos/:videoId/:resolution([0-9]+)(-:fps([0-9]+))?', - executeIfActivityPub(asyncMiddleware(videoRedundancyGetValidator)), + executeIfActivityPub(asyncMiddleware(videoFileRedundancyGetValidator)), + executeIfActivityPub(asyncMiddleware(videoRedundancyController)) +) +activityPubClientRouter.get('/redundancy/video-playlists/:streamingPlaylistType/:videoId', + executeIfActivityPub(asyncMiddleware(videoPlaylistRedundancyGetValidator)), executeIfActivityPub(asyncMiddleware(videoRedundancyController)) ) @@ -156,14 +157,15 @@ function getAccountVideoRate (rateType: VideoRateType) { const url = getRateUrl(rateType, byActor, accountVideoRate.Video) const APObject = rateType === 'like' ? buildLikeActivity(url, byActor, accountVideoRate.Video) - : buildCreateActivity(url, byActor, buildDislikeActivity(url, byActor, accountVideoRate.Video)) + : buildDislikeActivity(url, byActor, accountVideoRate.Video) return activityPubResponse(activityPubContextify(APObject), res) } } async function videoController (req: express.Request, res: express.Response) { - const video: VideoModel = res.locals.video + // We need more attributes + const video: VideoModel = await VideoModel.loadForGetAPI(res.locals.video.id) if (video.url.startsWith(CONFIG.WEBSERVER.URL) === false) return res.redirect(video.url) diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index a69a83acf..8c0237203 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts @@ -14,6 +14,8 @@ import { AccountModel } from '../../models/account/account' import { VideoModel } from '../../models/video/video' import { buildNSFWFilter, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils' import { VideoChannelModel } from '../../models/video/video-channel' +import { JobQueue } from '../../lib/job-queue' +import { logger } from '../../helpers/logger' const accountsRouter = express.Router() @@ -57,6 +59,11 @@ export { function getAccount (req: express.Request, res: express.Response, next: express.NextFunction) { const account: AccountModel = res.locals.account + if (account.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: account.Actor.url } }) + .catch(err => logger.error('Cannot create AP refresher job for actor %s.', account.Actor.url, { err })) + } + return res.json(account.toFormattedJSON()) } diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index dd06a0597..1f3341bc0 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -1,5 +1,5 @@ import * as express from 'express' -import { omit, snakeCase } from 'lodash' +import { snakeCase } from 'lodash' import { ServerConfig, UserRight } from '../../../shared' import { About } from '../../../shared/models/server/about.model' import { CustomConfig } from '../../../shared/models/server/custom-config.model' @@ -78,6 +78,9 @@ async function getConfig (req: express.Request, res: express.Response) { requiresEmailVerification: CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION }, transcoding: { + hls: { + enabled: CONFIG.TRANSCODING.HLS.ENABLED + }, enabledResolutions }, import: { @@ -120,6 +123,11 @@ async function getConfig (req: express.Request, res: express.Response) { user: { videoQuota: CONFIG.USER.VIDEO_QUOTA, videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY + }, + trending: { + videos: { + intervalDays: CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS + } } } @@ -241,6 +249,9 @@ function customConfig (): CustomConfig { '480p': CONFIG.TRANSCODING.RESOLUTIONS[ '480p' ], '720p': CONFIG.TRANSCODING.RESOLUTIONS[ '720p' ], '1080p': CONFIG.TRANSCODING.RESOLUTIONS[ '1080p' ] + }, + hls: { + enabled: CONFIG.TRANSCODING.HLS.ENABLED } }, import: { diff --git a/server/controllers/api/server/stats.ts b/server/controllers/api/server/stats.ts index 85803f69e..89ffd1717 100644 --- a/server/controllers/api/server/stats.ts +++ b/server/controllers/api/server/stats.ts @@ -8,6 +8,7 @@ import { VideoCommentModel } from '../../../models/video/video-comment' import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' import { CONFIG, ROUTE_CACHE_LIFETIME } from '../../../initializers/constants' import { cacheRoute } from '../../../middlewares/cache' +import { VideoFileModel } from '../../../models/video/video-file' const statsRouter = express.Router() @@ -16,11 +17,12 @@ statsRouter.get('/stats', asyncMiddleware(getStats) ) -async function getStats (req: express.Request, res: express.Response, next: express.NextFunction) { +async function getStats (req: express.Request, res: express.Response) { const { totalLocalVideos, totalLocalVideoViews, totalVideos } = await VideoModel.getStats() const { totalLocalVideoComments, totalVideoComments } = await VideoCommentModel.getStats() const { totalUsers } = await UserModel.getStats() const { totalInstanceFollowers, totalInstanceFollowing } = await ActorFollowModel.getStats() + const { totalLocalVideoFilesSize } = await VideoFileModel.getStats() const videosRedundancyStats = await Promise.all( CONFIG.REDUNDANCY.VIDEOS.STRATEGIES.map(r => { @@ -32,8 +34,9 @@ async function getStats (req: express.Request, res: express.Response, next: expr const data: ServerStats = { totalLocalVideos, totalLocalVideoViews, - totalVideos, + totalLocalVideoFilesSize, totalLocalVideoComments, + totalVideos, totalVideoComments, totalUsers, totalInstanceFollowers, diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts index 9e6a019f6..e3533a7f6 100644 --- a/server/controllers/api/users/index.ts +++ b/server/controllers/api/users/index.ts @@ -41,6 +41,7 @@ import { myBlocklistRouter } from './my-blocklist' import { myVideosHistoryRouter } from './my-history' import { myNotificationsRouter } from './my-notifications' import { Notifier } from '../../../lib/notifier' +import { mySubscriptionsRouter } from './my-subscriptions' const auditLogger = auditLoggerFactory('users') @@ -58,6 +59,7 @@ const askSendEmailLimiter = new RateLimit({ const usersRouter = express.Router() usersRouter.use('/', myNotificationsRouter) +usersRouter.use('/', mySubscriptionsRouter) usersRouter.use('/', myBlocklistRouter) usersRouter.use('/', myVideosHistoryRouter) usersRouter.use('/', meRouter) @@ -227,7 +229,7 @@ async function unblockUser (req: express.Request, res: express.Response, next: e return res.status(204).end() } -async function blockUser (req: express.Request, res: express.Response, next: express.NextFunction) { +async function blockUser (req: express.Request, res: express.Response) { const user: UserModel = res.locals.user const reason = req.body.reason @@ -236,23 +238,23 @@ async function blockUser (req: express.Request, res: express.Response, next: exp return res.status(204).end() } -function getUser (req: express.Request, res: express.Response, next: express.NextFunction) { +function getUser (req: express.Request, res: express.Response) { return res.json((res.locals.user as UserModel).toFormattedJSON()) } -async function autocompleteUsers (req: express.Request, res: express.Response, next: express.NextFunction) { +async function autocompleteUsers (req: express.Request, res: express.Response) { const resultList = await UserModel.autoComplete(req.query.search as string) return res.json(resultList) } -async function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) { +async function listUsers (req: express.Request, res: express.Response) { const resultList = await UserModel.listForApi(req.query.start, req.query.count, req.query.sort, req.query.search) return res.json(getFormattedObjects(resultList.data, resultList.total)) } -async function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) { +async function removeUser (req: express.Request, res: express.Response) { const user: UserModel = res.locals.user await user.destroy() @@ -262,12 +264,13 @@ async function removeUser (req: express.Request, res: express.Response, next: ex return res.sendStatus(204) } -async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) { +async function updateUser (req: express.Request, res: express.Response) { const body: UserUpdate = req.body const userToUpdate = res.locals.user as UserModel const oldUserAuditView = new UserAuditView(userToUpdate.toFormattedJSON()) const roleChanged = body.role !== undefined && body.role !== userToUpdate.role + if (body.password !== undefined) userToUpdate.password = body.password if (body.email !== undefined) userToUpdate.email = body.email if (body.emailVerified !== undefined) userToUpdate.emailVerified = body.emailVerified if (body.videoQuota !== undefined) userToUpdate.videoQuota = body.videoQuota @@ -277,11 +280,11 @@ async function updateUser (req: express.Request, res: express.Response, next: ex const user = await userToUpdate.save() // Destroy user token to refresh rights - if (roleChanged) await deleteUserToken(userToUpdate.id) + if (roleChanged || body.password !== undefined) await deleteUserToken(userToUpdate.id) auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView) - // Don't need to send this update to followers, these attributes are not propagated + // Don't need to send this update to followers, these attributes are not federated return res.sendStatus(204) } @@ -291,7 +294,7 @@ async function askResetUserPassword (req: express.Request, res: express.Response const verificationString = await Redis.Instance.setResetPasswordVerificationString(user.id) const url = CONFIG.WEBSERVER.URL + '/reset-password?userId=' + user.id + '&verificationString=' + verificationString - await Emailer.Instance.addForgetPasswordEmailJob(user.email, url) + await Emailer.Instance.addPasswordResetEmailJob(user.email, url) return res.status(204).end() } diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index 8a3208160..d5e154869 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts @@ -8,36 +8,23 @@ import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, - commonVideosFiltersValidator, paginationValidator, setDefaultPagination, setDefaultSort, - userSubscriptionAddValidator, - userSubscriptionGetValidator, usersUpdateMeValidator, usersVideoRatingValidator } from '../../../middlewares' -import { - areSubscriptionsExistValidator, - deleteMeValidator, - userSubscriptionsSortValidator, - videoImportsSortValidator, - videosSortValidator -} from '../../../middlewares/validators' +import { deleteMeValidator, videoImportsSortValidator, videosSortValidator } from '../../../middlewares/validators' import { AccountVideoRateModel } from '../../../models/account/account-video-rate' import { UserModel } from '../../../models/account/user' import { VideoModel } from '../../../models/video/video' import { VideoSortField } from '../../../../client/src/app/shared/video/sort-field.type' -import { buildNSFWFilter, createReqFiles } from '../../../helpers/express-utils' +import { createReqFiles } from '../../../helpers/express-utils' import { UserVideoQuota } from '../../../../shared/models/users/user-video-quota.model' import { updateAvatarValidator } from '../../../middlewares/validators/avatar' import { updateActorAvatarFile } from '../../../lib/avatar' import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '../../../helpers/audit-logger' import { VideoImportModel } from '../../../models/video/video-import' -import { VideoFilter } from '../../../../shared/models/videos/video-query.type' -import { ActorFollowModel } from '../../../models/activitypub/actor-follow' -import { JobQueue } from '../../../lib/job-queue' -import { logger } from '../../../helpers/logger' import { AccountModel } from '../../../models/account/account' const auditLogger = auditLoggerFactory('users-me') @@ -98,51 +85,6 @@ meRouter.post('/me/avatar/pick', asyncRetryTransactionMiddleware(updateMyAvatar) ) -// ##### Subscriptions part ##### - -meRouter.get('/me/subscriptions/videos', - authenticate, - paginationValidator, - videosSortValidator, - setDefaultSort, - setDefaultPagination, - commonVideosFiltersValidator, - asyncMiddleware(getUserSubscriptionVideos) -) - -meRouter.get('/me/subscriptions/exist', - authenticate, - areSubscriptionsExistValidator, - asyncMiddleware(areSubscriptionsExist) -) - -meRouter.get('/me/subscriptions', - authenticate, - paginationValidator, - userSubscriptionsSortValidator, - setDefaultSort, - setDefaultPagination, - asyncMiddleware(getUserSubscriptions) -) - -meRouter.post('/me/subscriptions', - authenticate, - userSubscriptionAddValidator, - asyncMiddleware(addUserSubscription) -) - -meRouter.get('/me/subscriptions/:uri', - authenticate, - userSubscriptionGetValidator, - getUserSubscription -) - -meRouter.delete('/me/subscriptions/:uri', - authenticate, - userSubscriptionGetValidator, - asyncRetryTransactionMiddleware(deleteUserSubscription) -) - // --------------------------------------------------------------------------- export { @@ -151,100 +93,6 @@ export { // --------------------------------------------------------------------------- -async function areSubscriptionsExist (req: express.Request, res: express.Response) { - const uris = req.query.uris as string[] - const user = res.locals.oauth.token.User as UserModel - - const handles = uris.map(u => { - let [ name, host ] = u.split('@') - if (host === CONFIG.WEBSERVER.HOST) host = null - - return { name, host, uri: u } - }) - - const results = await ActorFollowModel.listSubscribedIn(user.Account.Actor.id, handles) - - const existObject: { [id: string ]: boolean } = {} - for (const handle of handles) { - const obj = results.find(r => { - const server = r.ActorFollowing.Server - - return r.ActorFollowing.preferredUsername === handle.name && - ( - (!server && !handle.host) || - (server.host === handle.host) - ) - }) - - existObject[handle.uri] = obj !== undefined - } - - return res.json(existObject) -} - -async function addUserSubscription (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User as UserModel - const [ name, host ] = req.body.uri.split('@') - - const payload = { - name, - host, - followerActorId: user.Account.Actor.id - } - - JobQueue.Instance.createJob({ type: 'activitypub-follow', payload }) - .catch(err => logger.error('Cannot create follow job for subscription %s.', req.body.uri, err)) - - return res.status(204).end() -} - -function getUserSubscription (req: express.Request, res: express.Response) { - const subscription: ActorFollowModel = res.locals.subscription - - return res.json(subscription.ActorFollowing.VideoChannel.toFormattedJSON()) -} - -async function deleteUserSubscription (req: express.Request, res: express.Response) { - const subscription: ActorFollowModel = res.locals.subscription - - await sequelizeTypescript.transaction(async t => { - return subscription.destroy({ transaction: t }) - }) - - return res.type('json').status(204).end() -} - -async function getUserSubscriptions (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User as UserModel - const actorId = user.Account.Actor.id - - const resultList = await ActorFollowModel.listSubscriptionsForApi(actorId, req.query.start, req.query.count, req.query.sort) - - return res.json(getFormattedObjects(resultList.data, resultList.total)) -} - -async function getUserSubscriptionVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const user = res.locals.oauth.token.User as UserModel - const resultList = await VideoModel.listForApi({ - start: req.query.start, - count: req.query.count, - sort: req.query.sort, - includeLocalVideos: false, - categoryOneOf: req.query.categoryOneOf, - licenceOneOf: req.query.licenceOneOf, - languageOneOf: req.query.languageOneOf, - tagsOneOf: req.query.tagsOneOf, - tagsAllOf: req.query.tagsAllOf, - nsfw: buildNSFWFilter(res, req.query.nsfw), - filter: req.query.filter as VideoFilter, - withFiles: false, - followerActorId: user.Account.Actor.id, - user - }) - - return res.json(getFormattedObjects(resultList.data, resultList.total)) -} - async function getUserVideos (req: express.Request, res: express.Response, next: express.NextFunction) { const user = res.locals.oauth.token.User as UserModel const resultList = await VideoModel.listUserVideosForApi( @@ -319,7 +167,7 @@ async function deleteMe (req: express.Request, res: express.Response) { return res.sendStatus(204) } -async function updateMe (req: express.Request, res: express.Response, next: express.NextFunction) { +async function updateMe (req: express.Request, res: express.Response) { const body: UserUpdateMe = req.body const user: UserModel = res.locals.oauth.token.user diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts new file mode 100644 index 000000000..accca6d52 --- /dev/null +++ b/server/controllers/api/users/my-subscriptions.ts @@ -0,0 +1,170 @@ +import * as express from 'express' +import 'multer' +import { getFormattedObjects } from '../../../helpers/utils' +import { CONFIG, sequelizeTypescript } from '../../../initializers' +import { + asyncMiddleware, + asyncRetryTransactionMiddleware, + authenticate, + commonVideosFiltersValidator, + paginationValidator, + setDefaultPagination, + setDefaultSort, + userSubscriptionAddValidator, + userSubscriptionGetValidator +} from '../../../middlewares' +import { areSubscriptionsExistValidator, userSubscriptionsSortValidator, videosSortValidator } from '../../../middlewares/validators' +import { UserModel } from '../../../models/account/user' +import { VideoModel } from '../../../models/video/video' +import { buildNSFWFilter } from '../../../helpers/express-utils' +import { VideoFilter } from '../../../../shared/models/videos/video-query.type' +import { ActorFollowModel } from '../../../models/activitypub/actor-follow' +import { JobQueue } from '../../../lib/job-queue' +import { logger } from '../../../helpers/logger' + +const mySubscriptionsRouter = express.Router() + +mySubscriptionsRouter.get('/me/subscriptions/videos', + authenticate, + paginationValidator, + videosSortValidator, + setDefaultSort, + setDefaultPagination, + commonVideosFiltersValidator, + asyncMiddleware(getUserSubscriptionVideos) +) + +mySubscriptionsRouter.get('/me/subscriptions/exist', + authenticate, + areSubscriptionsExistValidator, + asyncMiddleware(areSubscriptionsExist) +) + +mySubscriptionsRouter.get('/me/subscriptions', + authenticate, + paginationValidator, + userSubscriptionsSortValidator, + setDefaultSort, + setDefaultPagination, + asyncMiddleware(getUserSubscriptions) +) + +mySubscriptionsRouter.post('/me/subscriptions', + authenticate, + userSubscriptionAddValidator, + asyncMiddleware(addUserSubscription) +) + +mySubscriptionsRouter.get('/me/subscriptions/:uri', + authenticate, + userSubscriptionGetValidator, + getUserSubscription +) + +mySubscriptionsRouter.delete('/me/subscriptions/:uri', + authenticate, + userSubscriptionGetValidator, + asyncRetryTransactionMiddleware(deleteUserSubscription) +) + +// --------------------------------------------------------------------------- + +export { + mySubscriptionsRouter +} + +// --------------------------------------------------------------------------- + +async function areSubscriptionsExist (req: express.Request, res: express.Response) { + const uris = req.query.uris as string[] + const user = res.locals.oauth.token.User as UserModel + + const handles = uris.map(u => { + let [ name, host ] = u.split('@') + if (host === CONFIG.WEBSERVER.HOST) host = null + + return { name, host, uri: u } + }) + + const results = await ActorFollowModel.listSubscribedIn(user.Account.Actor.id, handles) + + const existObject: { [id: string ]: boolean } = {} + for (const handle of handles) { + const obj = results.find(r => { + const server = r.ActorFollowing.Server + + return r.ActorFollowing.preferredUsername === handle.name && + ( + (!server && !handle.host) || + (server.host === handle.host) + ) + }) + + existObject[handle.uri] = obj !== undefined + } + + return res.json(existObject) +} + +async function addUserSubscription (req: express.Request, res: express.Response) { + const user = res.locals.oauth.token.User as UserModel + const [ name, host ] = req.body.uri.split('@') + + const payload = { + name, + host, + followerActorId: user.Account.Actor.id + } + + JobQueue.Instance.createJob({ type: 'activitypub-follow', payload }) + .catch(err => logger.error('Cannot create follow job for subscription %s.', req.body.uri, err)) + + return res.status(204).end() +} + +function getUserSubscription (req: express.Request, res: express.Response) { + const subscription: ActorFollowModel = res.locals.subscription + + return res.json(subscription.ActorFollowing.VideoChannel.toFormattedJSON()) +} + +async function deleteUserSubscription (req: express.Request, res: express.Response) { + const subscription: ActorFollowModel = res.locals.subscription + + await sequelizeTypescript.transaction(async t => { + return subscription.destroy({ transaction: t }) + }) + + return res.type('json').status(204).end() +} + +async function getUserSubscriptions (req: express.Request, res: express.Response) { + const user = res.locals.oauth.token.User as UserModel + const actorId = user.Account.Actor.id + + const resultList = await ActorFollowModel.listSubscriptionsForApi(actorId, req.query.start, req.query.count, req.query.sort) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) +} + +async function getUserSubscriptionVideos (req: express.Request, res: express.Response, next: express.NextFunction) { + const user = res.locals.oauth.token.User as UserModel + const resultList = await VideoModel.listForApi({ + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + includeLocalVideos: false, + categoryOneOf: req.query.categoryOneOf, + licenceOneOf: req.query.licenceOneOf, + languageOneOf: req.query.languageOneOf, + tagsOneOf: req.query.tagsOneOf, + tagsAllOf: req.query.tagsAllOf, + nsfw: buildNSFWFilter(res, req.query.nsfw), + filter: req.query.filter as VideoFilter, + withFiles: false, + followerActorId: user.Account.Actor.id, + user + }) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) +} diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index 3d6a6af7f..db7602139 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts @@ -30,6 +30,7 @@ import { updateActorAvatarFile } from '../../lib/avatar' import { auditLoggerFactory, getAuditIdFromRes, VideoChannelAuditView } from '../../helpers/audit-logger' import { resetSequelizeInstance } from '../../helpers/database-utils' import { UserModel } from '../../models/account/user' +import { JobQueue } from '../../lib/job-queue' const auditLogger = auditLoggerFactory('channels') const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR }) @@ -197,6 +198,11 @@ async function removeVideoChannel (req: express.Request, res: express.Response) async function getVideoChannel (req: express.Request, res: express.Response, next: express.NextFunction) { const videoChannelWithVideos = await VideoChannelModel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id) + if (videoChannelWithVideos.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: videoChannelWithVideos.Actor.url } }) + .catch(err => logger.error('Cannot create AP refresher job for actor %s.', videoChannelWithVideos.Actor.url, { err })) + } + return res.json(videoChannelWithVideos.toFormattedJSON()) } diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index fe0a95cd5..32f9c4793 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -3,7 +3,6 @@ import { UserRight, VideoAbuseCreate, VideoAbuseState } from '../../../../shared import { logger } from '../../../helpers/logger' import { getFormattedObjects } from '../../../helpers/utils' import { sequelizeTypescript } from '../../../initializers' -import { sendVideoAbuse } from '../../../lib/activitypub/send' import { asyncMiddleware, asyncRetryTransactionMiddleware, @@ -23,6 +22,7 @@ import { VideoAbuseModel } from '../../../models/video/video-abuse' import { auditLoggerFactory, VideoAbuseAuditView } from '../../../helpers/audit-logger' import { UserModel } from '../../../models/account/user' import { Notifier } from '../../../lib/notifier' +import { sendVideoAbuse } from '../../../lib/activitypub/send/send-flag' const auditLogger = auditLoggerFactory('abuse') const abuseVideoRouter = express.Router() diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts index 9ef08812b..43b0516e7 100644 --- a/server/controllers/api/videos/blacklist.ts +++ b/server/controllers/api/videos/blacklist.ts @@ -18,6 +18,8 @@ import { VideoBlacklistModel } from '../../../models/video/video-blacklist' import { sequelizeTypescript } from '../../../initializers' import { Notifier } from '../../../lib/notifier' import { VideoModel } from '../../../models/video/video' +import { sendCreateVideo, sendDeleteVideo, sendUpdateVideo } from '../../../lib/activitypub/send' +import { federateVideoIfNeeded } from '../../../lib/activitypub' const blacklistRouter = express.Router() @@ -66,12 +68,17 @@ async function addVideoToBlacklist (req: express.Request, res: express.Response) const toCreate = { videoId: videoInstance.id, + unfederated: body.unfederate === true, reason: body.reason } const blacklist = await VideoBlacklistModel.create(toCreate) blacklist.Video = videoInstance + if (body.unfederate === true) { + await sendDeleteVideo(videoInstance, undefined) + } + Notifier.Instance.notifyOnVideoBlacklist(blacklist) logger.info('Video %s blacklisted.', res.locals.video.uuid) @@ -101,8 +108,14 @@ async function removeVideoFromBlacklistController (req: express.Request, res: ex const videoBlacklist = res.locals.videoBlacklist as VideoBlacklistModel const video: VideoModel = res.locals.video - await sequelizeTypescript.transaction(t => { - return videoBlacklist.destroy({ transaction: t }) + await sequelizeTypescript.transaction(async t => { + const unfederated = videoBlacklist.unfederated + await videoBlacklist.destroy({ transaction: t }) + + // Re federate the video + if (unfederated === true) { + await federateVideoIfNeeded(video, true, t) + } }) Notifier.Instance.notifyOnVideoUnblacklist(video) diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index 98366cd82..7053d5253 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -164,6 +164,7 @@ function buildVideo (channelId: number, body: VideoImportCreate, importData: You licence: body.licence || importData.licence, language: body.language || undefined, commentsEnabled: body.commentsEnabled || true, + downloadEnabled: body.downloadEnabled || true, waitTranscoding: body.waitTranscoding || false, state: VideoState.TO_IMPORT, nsfw: body.nsfw || importData.nsfw || false, diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index b26dcabe1..6ac13e6a4 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -23,7 +23,6 @@ import { fetchRemoteVideoDescription, getVideoActivityPubUrl } from '../../../lib/activitypub' -import { sendCreateView } from '../../../lib/activitypub/send' import { JobQueue } from '../../../lib/job-queue' import { Redis } from '../../../lib/redis' import { @@ -37,6 +36,7 @@ import { setDefaultPagination, setDefaultSort, videosAddValidator, + videosCustomGetValidator, videosGetValidator, videosRemoveValidator, videosSortValidator, @@ -59,6 +59,7 @@ import { resetSequelizeInstance } from '../../../helpers/database-utils' import { move } from 'fs-extra' import { watchingRouter } from './watching' import { Notifier } from '../../../lib/notifier' +import { sendView } from '../../../lib/activitypub/send/send-view' const auditLogger = auditLoggerFactory('videos') const videosRouter = express.Router() @@ -123,9 +124,9 @@ videosRouter.get('/:id/description', ) videosRouter.get('/:id', optionalAuthenticate, - asyncMiddleware(videosGetValidator), + asyncMiddleware(videosCustomGetValidator('only-video-with-rights')), asyncMiddleware(checkVideoFollowConstraints), - getVideo + asyncMiddleware(getVideo) ) videosRouter.post('/:id/views', asyncMiddleware(videosGetValidator), @@ -181,6 +182,7 @@ async function addVideo (req: express.Request, res: express.Response) { licence: videoInfo.licence, language: videoInfo.language, commentsEnabled: videoInfo.commentsEnabled || false, + downloadEnabled: videoInfo.downloadEnabled || true, waitTranscoding: videoInfo.waitTranscoding || false, state: CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED, nsfw: videoInfo.nsfw || false, @@ -326,8 +328,9 @@ async function updateVideo (req: express.Request, res: express.Response) { if (videoInfoToUpdate.support !== undefined) videoInstance.set('support', videoInfoToUpdate.support) if (videoInfoToUpdate.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description) if (videoInfoToUpdate.commentsEnabled !== undefined) videoInstance.set('commentsEnabled', videoInfoToUpdate.commentsEnabled) - if (videoInfoToUpdate.originallyPublishedAt !== undefined && - videoInfoToUpdate.originallyPublishedAt !== null) { + if (videoInfoToUpdate.downloadEnabled !== undefined) videoInstance.set('downloadEnabled', videoInfoToUpdate.downloadEnabled) + + if (videoInfoToUpdate.originallyPublishedAt !== undefined && videoInfoToUpdate.originallyPublishedAt !== null) { videoInstance.set('originallyPublishedAt', videoInfoToUpdate.originallyPublishedAt) } @@ -370,7 +373,11 @@ async function updateVideo (req: express.Request, res: express.Response) { } const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE - await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) + + // Don't send update if the video was unfederated + if (!videoInstanceUpdated.VideoBlacklist || videoInstanceUpdated.VideoBlacklist.unfederated === false) { + await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) + } auditLogger.update( getAuditIdFromRes(res), @@ -397,15 +404,17 @@ async function updateVideo (req: express.Request, res: express.Response) { return res.type('json').status(204).end() } -function getVideo (req: express.Request, res: express.Response) { - const videoInstance = res.locals.video +async function getVideo (req: express.Request, res: express.Response) { + // We need more attributes + const userId: number = res.locals.oauth ? res.locals.oauth.token.User.id : null + const video: VideoModel = await VideoModel.loadForGetAPI(res.locals.video.id, undefined, userId) - if (videoInstance.isOutdated()) { - JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', videoUrl: videoInstance.url } }) - .catch(err => logger.error('Cannot create AP refresher job for video %s.', videoInstance.url, { err })) + if (video.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: video.url } }) + .catch(err => logger.error('Cannot create AP refresher job for video %s.', video.url, { err })) } - return res.json(videoInstance.toFormattedDetailsJSON()) + return res.json(video.toFormattedDetailsJSON()) } async function viewVideo (req: express.Request, res: express.Response) { @@ -424,7 +433,7 @@ async function viewVideo (req: express.Request, res: express.Response) { ]) const serverActor = await getServerActor() - await sendCreateView(serverActor, videoInstance, undefined) + await sendView(serverActor, videoInstance, undefined) return res.status(204).end() } diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 4fd58f70c..b21f9da00 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -1,6 +1,6 @@ import * as cors from 'cors' import * as express from 'express' -import { CONFIG, ROUTE_CACHE_LIFETIME, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers' +import { CONFIG, HLS_PLAYLIST_DIRECTORY, ROUTE_CACHE_LIFETIME, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers' import { VideosPreviewCache } from '../lib/cache' import { cacheRoute } from '../middlewares/cache' import { asyncMiddleware, videosGetValidator } from '../middlewares' @@ -51,6 +51,13 @@ staticRouter.use( asyncMiddleware(downloadVideoFile) ) +// HLS +staticRouter.use( + STATIC_PATHS.PLAYLISTS.HLS, + cors(), + express.static(HLS_PLAYLIST_DIRECTORY, { fallthrough: false }) // 404 if the file does not exist +) + // Thumbnails path for express const thumbnailsPhysicalPath = CONFIG.STORAGE.THUMBNAILS_DIR staticRouter.use( diff --git a/server/controllers/tracker.ts b/server/controllers/tracker.ts index 1deb8c402..8b77d9de7 100644 --- a/server/controllers/tracker.ts +++ b/server/controllers/tracker.ts @@ -7,6 +7,7 @@ import { Server as WebSocketServer } from 'ws' import { CONFIG, TRACKER_RATE_LIMITS } from '../initializers/constants' import { VideoFileModel } from '../models/video/video-file' import { parse } from 'url' +import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist' const TrackerServer = bitTorrentTracker.Server @@ -21,7 +22,7 @@ const trackerServer = new TrackerServer({ udp: false, ws: false, dht: false, - filter: function (infoHash, params, cb) { + filter: async function (infoHash, params, cb) { let ip: string if (params.type === 'ws') { @@ -32,19 +33,25 @@ const trackerServer = new TrackerServer({ const key = ip + '-' + infoHash - peersIps[ip] = peersIps[ip] ? peersIps[ip] + 1 : 1 - peersIpInfoHash[key] = peersIpInfoHash[key] ? peersIpInfoHash[key] + 1 : 1 + peersIps[ ip ] = peersIps[ ip ] ? peersIps[ ip ] + 1 : 1 + peersIpInfoHash[ key ] = peersIpInfoHash[ key ] ? peersIpInfoHash[ key ] + 1 : 1 - if (peersIpInfoHash[key] > TRACKER_RATE_LIMITS.ANNOUNCES_PER_IP_PER_INFOHASH) { + if (peersIpInfoHash[ key ] > TRACKER_RATE_LIMITS.ANNOUNCES_PER_IP_PER_INFOHASH) { return cb(new Error(`Too many requests (${peersIpInfoHash[ key ]} of ip ${ip} for torrent ${infoHash}`)) } - VideoFileModel.isInfohashExists(infoHash) - .then(exists => { - if (exists === false) return cb(new Error(`Unknown infoHash ${infoHash}`)) + try { + const videoFileExists = await VideoFileModel.doesInfohashExist(infoHash) + if (videoFileExists === true) return cb() - return cb() - }) + const playlistExists = await VideoStreamingPlaylistModel.doesInfohashExist(infoHash) + if (playlistExists === true) return cb() + + return cb(new Error(`Unknown infoHash ${infoHash}`)) + } catch (err) { + logger.error('Error in tracker filter.', { err }) + return cb(err) + } } }) diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts index 79b76fa0b..62d78373e 100644 --- a/server/helpers/activitypub.ts +++ b/server/helpers/activitypub.ts @@ -15,7 +15,7 @@ function activityPubContextify (data: T) { 'https://w3id.org/security/v1', { RsaSignature2017: 'https://w3id.org/security#RsaSignature2017', - pt: 'https://joinpeertube.org/ns', + pt: 'https://joinpeertube.org/ns#', sc: 'http://schema.org#', Hashtag: 'as:Hashtag', uuid: 'sc:identifier', @@ -29,10 +29,12 @@ function activityPubContextify (data: T) { size: 'sc:Number', fps: 'sc:Number', commentsEnabled: 'sc:Boolean', + downloadEnabled: 'sc:Boolean', waitTranscoding: 'sc:Boolean', expires: 'sc:expires', support: 'sc:Text', - CacheFile: 'pt:CacheFile' + CacheFile: 'pt:CacheFile', + Infohash: 'pt:Infohash' }, { likes: { @@ -106,7 +108,7 @@ function buildSignedActivity (byActor: ActorModel, data: Object) { return signJsonLDObject(byActor, activity) as Promise } -function getAPUrl (activity: string | { id: string }) { +function getAPId (activity: string | { id: string }) { if (typeof activity === 'string') return activity return activity.id @@ -123,7 +125,7 @@ function checkUrlsSameHost (url1: string, url2: string) { export { checkUrlsSameHost, - getAPUrl, + getAPId, activityPubContextify, activityPubCollectionPagination, buildSignedActivity diff --git a/server/helpers/audit-logger.ts b/server/helpers/audit-logger.ts index 00311fce1..a121f0b8a 100644 --- a/server/helpers/audit-logger.ts +++ b/server/helpers/audit-logger.ts @@ -117,7 +117,8 @@ const videoKeysToKeep = [ 'channel-uuid', 'channel-name', 'support', - 'commentsEnabled' + 'commentsEnabled', + 'downloadEnabled' ] class VideoAuditView extends EntityAuditView { constructor (private video: VideoDetails) { diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index 3fb824e36..f38b82d97 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts @@ -193,10 +193,14 @@ function peertubeTruncate (str: string, maxLength: number) { return truncate(str, options) } -function sha256 (str: string, encoding: HexBase64Latin1Encoding = 'hex') { +function sha256 (str: string | Buffer, encoding: HexBase64Latin1Encoding = 'hex') { return createHash('sha256').update(str).digest(encoding) } +function sha1 (str: string | Buffer, encoding: HexBase64Latin1Encoding = 'hex') { + return createHash('sha1').update(str).digest(encoding) +} + function promisify0 (func: (cb: (err: any, result: A) => void) => void): () => Promise { return function promisified (): Promise { return new Promise((resolve: (arg: A) => void, reject: (err: any) => void) => { @@ -262,7 +266,9 @@ export { sanitizeHost, buildPath, peertubeTruncate, + sha256, + sha1, promisify0, promisify1, diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts index 2562ead9b..b24590d9d 100644 --- a/server/helpers/custom-validators/activitypub/activity.ts +++ b/server/helpers/custom-validators/activitypub/activity.ts @@ -1,26 +1,14 @@ import * as validator from 'validator' import { Activity, ActivityType } from '../../../../shared/models/activitypub' -import { - isActorAcceptActivityValid, - isActorDeleteActivityValid, - isActorFollowActivityValid, - isActorRejectActivityValid, - isActorUpdateActivityValid -} from './actor' -import { isAnnounceActivityValid } from './announce' -import { isActivityPubUrlValid } from './misc' -import { isDislikeActivityValid, isLikeActivityValid } from './rate' -import { isUndoActivityValid } from './undo' -import { isVideoCommentCreateActivityValid, isVideoCommentDeleteActivityValid } from './video-comments' -import { - isVideoFlagValid, - isVideoTorrentDeleteActivityValid, - sanitizeAndCheckVideoTorrentCreateActivity, - sanitizeAndCheckVideoTorrentUpdateActivity -} from './videos' +import { sanitizeAndCheckActorObject } from './actor' +import { isActivityPubUrlValid, isBaseActivityValid, isObjectValid } from './misc' +import { isDislikeActivityValid } from './rate' +import { sanitizeAndCheckVideoCommentObject } from './video-comments' +import { sanitizeAndCheckVideoTorrentObject } from './videos' import { isViewActivityValid } from './view' import { exists } from '../misc' -import { isCacheFileCreateActivityValid, isCacheFileUpdateActivityValid } from './cache-file' +import { isCacheFileObjectValid } from './cache-file' +import { isFlagActivityValid } from './flag' function isRootActivityValid (activity: any) { return Array.isArray(activity['@context']) && ( @@ -46,7 +34,10 @@ const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean Reject: checkRejectActivity, Announce: checkAnnounceActivity, Undo: checkUndoActivity, - Like: checkLikeActivity + Like: checkLikeActivity, + View: checkViewActivity, + Flag: checkFlagActivity, + Dislike: checkDislikeActivity } function isActivityValid (activity: any) { @@ -66,47 +57,79 @@ export { // --------------------------------------------------------------------------- +function checkViewActivity (activity: any) { + return isBaseActivityValid(activity, 'View') && + isViewActivityValid(activity) +} + +function checkFlagActivity (activity: any) { + return isBaseActivityValid(activity, 'Flag') && + isFlagActivityValid(activity) +} + +function checkDislikeActivity (activity: any) { + return isBaseActivityValid(activity, 'Dislike') && + isDislikeActivityValid(activity) +} + function checkCreateActivity (activity: any) { - return isViewActivityValid(activity) || - isDislikeActivityValid(activity) || - sanitizeAndCheckVideoTorrentCreateActivity(activity) || - isVideoFlagValid(activity) || - isVideoCommentCreateActivityValid(activity) || - isCacheFileCreateActivityValid(activity) + return isBaseActivityValid(activity, 'Create') && + ( + isViewActivityValid(activity.object) || + isDislikeActivityValid(activity.object) || + isFlagActivityValid(activity.object) || + + isCacheFileObjectValid(activity.object) || + sanitizeAndCheckVideoCommentObject(activity.object) || + sanitizeAndCheckVideoTorrentObject(activity.object) + ) } function checkUpdateActivity (activity: any) { - return isCacheFileUpdateActivityValid(activity) || - sanitizeAndCheckVideoTorrentUpdateActivity(activity) || - isActorUpdateActivityValid(activity) + return isBaseActivityValid(activity, 'Update') && + ( + isCacheFileObjectValid(activity.object) || + sanitizeAndCheckVideoTorrentObject(activity.object) || + sanitizeAndCheckActorObject(activity.object) + ) } function checkDeleteActivity (activity: any) { - return isVideoTorrentDeleteActivityValid(activity) || - isActorDeleteActivityValid(activity) || - isVideoCommentDeleteActivityValid(activity) + // We don't really check objects + return isBaseActivityValid(activity, 'Delete') && + isObjectValid(activity.object) } function checkFollowActivity (activity: any) { - return isActorFollowActivityValid(activity) + return isBaseActivityValid(activity, 'Follow') && + isObjectValid(activity.object) } function checkAcceptActivity (activity: any) { - return isActorAcceptActivityValid(activity) + return isBaseActivityValid(activity, 'Accept') } function checkRejectActivity (activity: any) { - return isActorRejectActivityValid(activity) + return isBaseActivityValid(activity, 'Reject') } function checkAnnounceActivity (activity: any) { - return isAnnounceActivityValid(activity) + return isBaseActivityValid(activity, 'Announce') && + isObjectValid(activity.object) } function checkUndoActivity (activity: any) { - return isUndoActivityValid(activity) + return isBaseActivityValid(activity, 'Undo') && + ( + checkFollowActivity(activity.object) || + checkLikeActivity(activity.object) || + checkDislikeActivity(activity.object) || + checkAnnounceActivity(activity.object) || + checkCreateActivity(activity.object) + ) } function checkLikeActivity (activity: any) { - return isLikeActivityValid(activity) + return isBaseActivityValid(activity, 'Like') && + isObjectValid(activity.object) } diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index 070632a20..c05f60f14 100644 --- a/server/helpers/custom-validators/activitypub/actor.ts +++ b/server/helpers/custom-validators/activitypub/actor.ts @@ -73,24 +73,10 @@ function isActorDeleteActivityValid (activity: any) { return isBaseActivityValid(activity, 'Delete') } -function isActorFollowActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Follow') && - isActivityPubUrlValid(activity.object) -} - -function isActorAcceptActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Accept') -} - -function isActorRejectActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Reject') -} - -function isActorUpdateActivityValid (activity: any) { - normalizeActor(activity.object) +function sanitizeAndCheckActorObject (object: any) { + normalizeActor(object) - return isBaseActivityValid(activity, 'Update') && - isActorObjectValid(activity.object) + return isActorObjectValid(object) } function normalizeActor (actor: any) { @@ -139,10 +125,7 @@ export { isActorObjectValid, isActorFollowingCountValid, isActorFollowersCountValid, - isActorFollowActivityValid, - isActorAcceptActivityValid, - isActorRejectActivityValid, isActorDeleteActivityValid, - isActorUpdateActivityValid, + sanitizeAndCheckActorObject, isValidActorHandle } diff --git a/server/helpers/custom-validators/activitypub/announce.ts b/server/helpers/custom-validators/activitypub/announce.ts deleted file mode 100644 index 0519c6026..000000000 --- a/server/helpers/custom-validators/activitypub/announce.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' - -function isAnnounceActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Announce') && - ( - isActivityPubUrlValid(activity.object) || - (activity.object && isActivityPubUrlValid(activity.object.id)) - ) -} - -export { - isAnnounceActivityValid -} diff --git a/server/helpers/custom-validators/activitypub/cache-file.ts b/server/helpers/custom-validators/activitypub/cache-file.ts index bd70934c8..21d5c53ca 100644 --- a/server/helpers/custom-validators/activitypub/cache-file.ts +++ b/server/helpers/custom-validators/activitypub/cache-file.ts @@ -1,28 +1,26 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' +import { isActivityPubUrlValid } from './misc' import { isRemoteVideoUrlValid } from './videos' -import { isDateValid, exists } from '../misc' +import { exists, isDateValid } from '../misc' import { CacheFileObject } from '../../../../shared/models/activitypub/objects' -function isCacheFileCreateActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - isCacheFileObjectValid(activity.object) -} - -function isCacheFileUpdateActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Update') && - isCacheFileObjectValid(activity.object) -} - function isCacheFileObjectValid (object: CacheFileObject) { return exists(object) && object.type === 'CacheFile' && isDateValid(object.expires) && isActivityPubUrlValid(object.object) && - isRemoteVideoUrlValid(object.url) + (isRemoteVideoUrlValid(object.url) || isPlaylistRedundancyUrlValid(object.url)) } +// --------------------------------------------------------------------------- + export { - isCacheFileUpdateActivityValid, - isCacheFileCreateActivityValid, isCacheFileObjectValid } + +// --------------------------------------------------------------------------- + +function isPlaylistRedundancyUrlValid (url: any) { + return url.type === 'Link' && + (url.mediaType || url.mimeType) === 'application/x-mpegURL' && + isActivityPubUrlValid(url.href) +} diff --git a/server/helpers/custom-validators/activitypub/flag.ts b/server/helpers/custom-validators/activitypub/flag.ts new file mode 100644 index 000000000..6452e297c --- /dev/null +++ b/server/helpers/custom-validators/activitypub/flag.ts @@ -0,0 +1,14 @@ +import { isActivityPubUrlValid } from './misc' +import { isVideoAbuseReasonValid } from '../video-abuses' + +function isFlagActivityValid (activity: any) { + return activity.type === 'Flag' && + isVideoAbuseReasonValid(activity.content) && + isActivityPubUrlValid(activity.object) +} + +// --------------------------------------------------------------------------- + +export { + isFlagActivityValid +} diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts index 4e2c57f04..f1762d11c 100644 --- a/server/helpers/custom-validators/activitypub/misc.ts +++ b/server/helpers/custom-validators/activitypub/misc.ts @@ -28,15 +28,20 @@ function isBaseActivityValid (activity: any, type: string) { return (activity['@context'] === undefined || Array.isArray(activity['@context'])) && activity.type === type && isActivityPubUrlValid(activity.id) && - exists(activity.actor) && - (isActivityPubUrlValid(activity.actor) || isActivityPubUrlValid(activity.actor.id)) && - ( - activity.to === undefined || - (Array.isArray(activity.to) && activity.to.every(t => isActivityPubUrlValid(t))) - ) && + isObjectValid(activity.actor) && + isUrlCollectionValid(activity.to) && + isUrlCollectionValid(activity.cc) +} + +function isUrlCollectionValid (collection: any) { + return collection === undefined || + (Array.isArray(collection) && collection.every(t => isActivityPubUrlValid(t))) +} + +function isObjectValid (object: any) { + return exists(object) && ( - activity.cc === undefined || - (Array.isArray(activity.cc) && activity.cc.every(t => isActivityPubUrlValid(t))) + isActivityPubUrlValid(object) || isActivityPubUrlValid(object.id) ) } @@ -57,5 +62,6 @@ export { isUrlValid, isActivityPubUrlValid, isBaseActivityValid, - setValidAttributedTo + setValidAttributedTo, + isObjectValid } diff --git a/server/helpers/custom-validators/activitypub/rate.ts b/server/helpers/custom-validators/activitypub/rate.ts index e70bd94b8..ba68e8074 100644 --- a/server/helpers/custom-validators/activitypub/rate.ts +++ b/server/helpers/custom-validators/activitypub/rate.ts @@ -1,20 +1,13 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' - -function isLikeActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Like') && - isActivityPubUrlValid(activity.object) -} +import { isActivityPubUrlValid, isObjectValid } from './misc' function isDislikeActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - activity.object.type === 'Dislike' && - isActivityPubUrlValid(activity.object.actor) && - isActivityPubUrlValid(activity.object.object) + return activity.type === 'Dislike' && + isActivityPubUrlValid(activity.actor) && + isObjectValid(activity.object) } // --------------------------------------------------------------------------- export { - isLikeActivityValid, isDislikeActivityValid } diff --git a/server/helpers/custom-validators/activitypub/undo.ts b/server/helpers/custom-validators/activitypub/undo.ts deleted file mode 100644 index 578035893..000000000 --- a/server/helpers/custom-validators/activitypub/undo.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { isActorFollowActivityValid } from './actor' -import { isBaseActivityValid } from './misc' -import { isDislikeActivityValid, isLikeActivityValid } from './rate' -import { isAnnounceActivityValid } from './announce' -import { isCacheFileCreateActivityValid } from './cache-file' - -function isUndoActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Undo') && - ( - isActorFollowActivityValid(activity.object) || - isLikeActivityValid(activity.object) || - isDislikeActivityValid(activity.object) || - isAnnounceActivityValid(activity.object) || - isCacheFileCreateActivityValid(activity.object) - ) -} - -export { - isUndoActivityValid -} diff --git a/server/helpers/custom-validators/activitypub/video-comments.ts b/server/helpers/custom-validators/activitypub/video-comments.ts index 051c4565a..0415db21c 100644 --- a/server/helpers/custom-validators/activitypub/video-comments.ts +++ b/server/helpers/custom-validators/activitypub/video-comments.ts @@ -3,11 +3,6 @@ import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers' import { exists, isArray, isDateValid } from '../misc' import { isActivityPubUrlValid, isBaseActivityValid } from './misc' -function isVideoCommentCreateActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - sanitizeAndCheckVideoCommentObject(activity.object) -} - function sanitizeAndCheckVideoCommentObject (comment: any) { if (!comment || comment.type !== 'Note') return false @@ -25,15 +20,9 @@ function sanitizeAndCheckVideoCommentObject (comment: any) { ) // Only accept public comments } -function isVideoCommentDeleteActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Delete') -} - // --------------------------------------------------------------------------- export { - isVideoCommentCreateActivityValid, - isVideoCommentDeleteActivityValid, sanitizeAndCheckVideoCommentObject } diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts index 95fe824b9..53ad0588d 100644 --- a/server/helpers/custom-validators/activitypub/videos.ts +++ b/server/helpers/custom-validators/activitypub/videos.ts @@ -1,7 +1,7 @@ import * as validator from 'validator' import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers' import { peertubeTruncate } from '../../core-utils' -import { exists, isBooleanValid, isDateValid, isUUIDValid } from '../misc' +import { exists, isArray, isBooleanValid, isDateValid, isUUIDValid } from '../misc' import { isVideoDurationValid, isVideoNameValid, @@ -12,29 +12,12 @@ import { } from '../videos' import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc' import { VideoState } from '../../../../shared/models/videos' -import { isVideoAbuseReasonValid } from '../video-abuses' - -function sanitizeAndCheckVideoTorrentCreateActivity (activity: any) { - return isBaseActivityValid(activity, 'Create') && - sanitizeAndCheckVideoTorrentObject(activity.object) -} function sanitizeAndCheckVideoTorrentUpdateActivity (activity: any) { return isBaseActivityValid(activity, 'Update') && sanitizeAndCheckVideoTorrentObject(activity.object) } -function isVideoTorrentDeleteActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Delete') -} - -function isVideoFlagValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - activity.object.type === 'Flag' && - isVideoAbuseReasonValid(activity.object.content) && - isActivityPubUrlValid(activity.object.object) -} - function isActivityPubVideoDurationValid (value: string) { // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration return exists(value) && @@ -56,6 +39,7 @@ function sanitizeAndCheckVideoTorrentObject (video: any) { // Default attributes if (!isVideoStateValid(video.state)) video.state = VideoState.PUBLISHED if (!isBooleanValid(video.waitTranscoding)) video.waitTranscoding = false + if (!isBooleanValid(video.downloadEnabled)) video.downloadEnabled = true return isActivityPubUrlValid(video.id) && isVideoNameValid(video.name) && @@ -67,6 +51,7 @@ function sanitizeAndCheckVideoTorrentObject (video: any) { isVideoViewsValid(video.views) && isBooleanValid(video.sensitive) && isBooleanValid(video.commentsEnabled) && + isBooleanValid(video.downloadEnabled) && isDateValid(video.published) && isDateValid(video.updated) && (!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) && @@ -97,17 +82,19 @@ function isRemoteVideoUrlValid (url: any) { ACTIVITY_PUB.URL_MIME_TYPES.MAGNET.indexOf(url.mediaType || url.mimeType) !== -1 && validator.isLength(url.href, { min: 5 }) && validator.isInt(url.height + '', { min: 0 }) + ) || + ( + (url.mediaType || url.mimeType) === 'application/x-mpegURL' && + isActivityPubUrlValid(url.href) && + isArray(url.tag) ) } // --------------------------------------------------------------------------- export { - sanitizeAndCheckVideoTorrentCreateActivity, sanitizeAndCheckVideoTorrentUpdateActivity, - isVideoTorrentDeleteActivityValid, isRemoteStringIdentifierValid, - isVideoFlagValid, sanitizeAndCheckVideoTorrentObject, isRemoteVideoUrlValid } diff --git a/server/helpers/custom-validators/activitypub/view.ts b/server/helpers/custom-validators/activitypub/view.ts index 7a3aca6f5..41d16469f 100644 --- a/server/helpers/custom-validators/activitypub/view.ts +++ b/server/helpers/custom-validators/activitypub/view.ts @@ -1,11 +1,11 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' +import { isActivityPubUrlValid } from './misc' function isViewActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - activity.object.type === 'View' && - isActivityPubUrlValid(activity.object.actor) && - isActivityPubUrlValid(activity.object.object) + return activity.type === 'View' && + isActivityPubUrlValid(activity.actor) && + isActivityPubUrlValid(activity.object) } + // --------------------------------------------------------------------------- export { diff --git a/server/helpers/custom-validators/misc.ts b/server/helpers/custom-validators/misc.ts index b6f0ebe6f..76647fea2 100644 --- a/server/helpers/custom-validators/misc.ts +++ b/server/helpers/custom-validators/misc.ts @@ -13,6 +13,10 @@ function isNotEmptyIntArray (value: any) { return Array.isArray(value) && value.every(v => validator.isInt('' + v)) && value.length !== 0 } +function isArrayOf (value: any, validator: (value: any) => boolean) { + return isArray(value) && value.every(v => validator(v)) +} + function isDateValid (value: string) { return exists(value) && validator.isISO8601(value) } @@ -82,6 +86,7 @@ function isFileValid ( export { exists, + isArrayOf, isNotEmptyIntArray, isArray, isIdValid, diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index ce4492a30..dd04aa5f6 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts @@ -88,8 +88,8 @@ function isVideoFileExtnameValid (value: string) { function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { const videoFileTypesRegex = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT) - .map(m => `(${m})`) - .join('|') + .map(m => `(${m})`) + .join('|') return isFileValid(files, videoFileTypesRegex, 'videofile', null) } diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index c7296054d..133b1b03b 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts @@ -1,5 +1,5 @@ import * as ffmpeg from 'fluent-ffmpeg' -import { join } from 'path' +import { dirname, join } from 'path' import { getTargetBitrate, VideoResolution } from '../../shared/models/videos' import { CONFIG, FFMPEG_NICE, VIDEO_TRANSCODING_FPS } from '../initializers/constants' import { processImage } from './image-utils' @@ -29,19 +29,28 @@ function computeResolutionsToTranscode (videoFileHeight: number) { return resolutionsEnabled } -async function getVideoFileResolution (path: string) { +async function getVideoFileSize (path: string) { const videoStream = await getVideoFileStream(path) return { - videoFileResolution: Math.min(videoStream.height, videoStream.width), - isPortraitMode: videoStream.height > videoStream.width + width: videoStream.width, + height: videoStream.height + } +} + +async function getVideoFileResolution (path: string) { + const size = await getVideoFileSize(path) + + return { + videoFileResolution: Math.min(size.height, size.width), + isPortraitMode: size.height > size.width } } async function getVideoFileFPS (path: string) { const videoStream = await getVideoFileStream(path) - for (const key of [ 'r_frame_rate' , 'avg_frame_rate' ]) { + for (const key of [ 'avg_frame_rate', 'r_frame_rate' ]) { const valuesText: string = videoStream[key] if (!valuesText) continue @@ -110,8 +119,12 @@ async function generateImageFromVideoFile (fromPath: string, folder: string, ima type TranscodeOptions = { inputPath: string outputPath: string - resolution?: VideoResolution + resolution: VideoResolution isPortraitMode?: boolean + + hlsPlaylist?: { + videoFilename: string + } } function transcode (options: TranscodeOptions) { @@ -150,6 +163,18 @@ function transcode (options: TranscodeOptions) { command = command.withFPS(fps) } + if (options.hlsPlaylist) { + const videoPath = `${dirname(options.outputPath)}/${options.hlsPlaylist.videoFilename}` + + command = command.outputOption('-hls_time 4') + .outputOption('-hls_list_size 0') + .outputOption('-hls_playlist_type vod') + .outputOption('-hls_segment_filename ' + videoPath) + .outputOption('-hls_segment_type fmp4') + .outputOption('-f hls') + .outputOption('-hls_flags single_file') + } + command .on('error', (err, stdout, stderr) => { logger.error('Error in transcoding job.', { stdout, stderr }) @@ -166,6 +191,7 @@ function transcode (options: TranscodeOptions) { // --------------------------------------------------------------------------- export { + getVideoFileSize, getVideoFileResolution, getDurationFromVideoFile, generateImageFromVideoFile, diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 3fc776f1a..5c6dc5e19 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -7,7 +7,7 @@ import { join } from 'path' function doRequest ( requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean } -): Bluebird<{ response: request.RequestResponse, body: any }> { +): Bluebird<{ response: request.RequestResponse, body: T }> { if (requestOptions.activityPub === true) { if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {} requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index 3c3406e38..cb0e823c5 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -7,7 +7,6 @@ import { join } from 'path' import { Instance as ParseTorrent } from 'parse-torrent' import { remove } from 'fs-extra' import * as memoizee from 'memoizee' -import { isArray } from './custom-validators/misc' function deleteFileAsync (path: string) { remove(path) diff --git a/server/helpers/video.ts b/server/helpers/video.ts index 1bd21467d..c90fe06c7 100644 --- a/server/helpers/video.ts +++ b/server/helpers/video.ts @@ -1,10 +1,12 @@ import { VideoModel } from '../models/video/video' -type VideoFetchType = 'all' | 'only-video' | 'id' | 'none' +type VideoFetchType = 'all' | 'only-video' | 'only-video-with-rights' | 'id' | 'none' function fetchVideo (id: number | string, fetchType: VideoFetchType, userId?: number) { if (fetchType === 'all') return VideoModel.loadAndPopulateAccountAndServerAndTags(id, undefined, userId) + if (fetchType === 'only-video-with-rights') return VideoModel.loadWithRights(id) + if (fetchType === 'only-video') return VideoModel.load(id) if (fetchType === 'id' || fetchType === 'none') return VideoModel.loadOnlyId(id) diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 7905d9ffa..29fdb263e 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -12,7 +12,7 @@ function checkMissedConfig () { 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max', 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', - 'storage.redundancy', 'storage.tmp', + 'storage.redundancy', 'storage.tmp', 'storage.playlists', 'log.level', 'user.video_quota', 'user.video_quota_daily', 'cache.previews.size', 'admin.email', 'contact_form.enabled', diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 4a88aef87..3656a23f9 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -16,7 +16,7 @@ let config: IConfig = require('config') // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 315 +const LAST_MIGRATION_VERSION = 340 // --------------------------------------------------------------------------- @@ -192,6 +192,7 @@ const CONFIG = { AVATARS_DIR: buildPath(config.get('storage.avatars')), LOG_DIR: buildPath(config.get('storage.logs')), VIDEOS_DIR: buildPath(config.get('storage.videos')), + PLAYLISTS_DIR: buildPath(config.get('storage.playlists')), REDUNDANCY_DIR: buildPath(config.get('storage.redundancy')), THUMBNAILS_DIR: buildPath(config.get('storage.thumbnails')), PREVIEWS_DIR: buildPath(config.get('storage.previews')), @@ -259,6 +260,9 @@ const CONFIG = { get '480p' () { return config.get('transcoding.resolutions.480p') }, get '720p' () { return config.get('transcoding.resolutions.720p') }, get '1080p' () { return config.get('transcoding.resolutions.1080p') } + }, + HLS: { + get ENABLED () { return config.get('transcoding.hls.enabled') } } }, IMPORT: { @@ -316,8 +320,8 @@ let CONSTRAINTS_FIELDS = { BLOCKED_REASON: { min: 3, max: 250 } // Length }, VIDEO_ABUSES: { - REASON: { min: 2, max: 300 }, // Length - MODERATION_COMMENT: { min: 2, max: 300 } // Length + REASON: { min: 2, max: 3000 }, // Length + MODERATION_COMMENT: { min: 2, max: 3000 } // Length }, VIDEO_BLACKLIST: { REASON: { min: 2, max: 300 } // Length @@ -590,6 +594,9 @@ const STATIC_PATHS = { TORRENTS: '/static/torrents/', WEBSEED: '/static/webseed/', REDUNDANCY: '/static/redundancy/', + PLAYLISTS: { + HLS: '/static/playlists/hls' + }, AVATARS: '/static/avatars/', VIDEO_CAPTIONS: '/static/video-captions/' } @@ -632,6 +639,9 @@ const CACHE = { } } +const HLS_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.PLAYLISTS_DIR, 'hls') +const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls') + const MEMOIZE_TTL = { OVERVIEWS_SAMPLE: 1000 * 3600 * 4 // 4 hours } @@ -701,6 +711,8 @@ if (isTestInstance() === true) { CACHE.VIDEO_CAPTIONS.MAX_AGE = 3000 MEMOIZE_TTL.OVERVIEWS_SAMPLE = 1 ROUTE_CACHE_LIFETIME.OVERVIEWS.VIDEOS = '0ms' + + RATES_LIMIT.LOGIN.MAX = 20 } updateWebserverUrls() @@ -709,6 +721,7 @@ updateWebserverUrls() export { API_VERSION, + HLS_REDUNDANCY_DIRECTORY, AVATARS_SIZE, ACCEPT_HEADERS, BCRYPT_SALT_SIZE, @@ -733,6 +746,7 @@ export { PRIVATE_RSA_KEY_SIZE, ROUTE_CACHE_LIFETIME, SORTABLE_COLUMNS, + HLS_PLAYLIST_DIRECTORY, FEEDS, JOB_TTL, NSFW_POLICY_TYPES, @@ -795,7 +809,9 @@ function buildVideoMimetypeExt () { 'video/quicktime': '.mov', 'video/x-msvideo': '.avi', 'video/x-flv': '.flv', - 'video/x-matroska': '.mkv' + 'video/x-matroska': '.mkv', + 'application/octet-stream': '.mkv', + 'video/avi': '.avi' }) } diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 84ad2079b..fe296142d 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -33,6 +33,7 @@ import { AccountBlocklistModel } from '../models/account/account-blocklist' import { ServerBlocklistModel } from '../models/server/server-blocklist' import { UserNotificationModel } from '../models/account/user-notification' import { UserNotificationSettingModel } from '../models/account/user-notification-setting' +import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist' require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string @@ -99,7 +100,8 @@ async function initDatabaseModels (silent: boolean) { AccountBlocklistModel, ServerBlocklistModel, UserNotificationModel, - UserNotificationSettingModel + UserNotificationSettingModel, + VideoStreamingPlaylistModel ]) // Check extensions exist in the database diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index b9a9da183..2b22e16fe 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -6,7 +6,7 @@ import { UserModel } from '../models/account/user' import { ApplicationModel } from '../models/application/application' import { OAuthClientModel } from '../models/oauth/oauth-client' import { applicationExist, clientsExist, usersExist } from './checker-after-init' -import { CACHE, CONFIG, LAST_MIGRATION_VERSION } from './constants' +import { CACHE, CONFIG, HLS_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION } from './constants' import { sequelizeTypescript } from './database' import { remove, ensureDir } from 'fs-extra' @@ -73,6 +73,9 @@ function createDirectoriesIfNotExist () { tasks.push(ensureDir(dir)) } + // Playlist directories + tasks.push(ensureDir(HLS_PLAYLIST_DIRECTORY)) + return Promise.all(tasks) } diff --git a/server/initializers/migrations/0320-blacklist-unfederate.ts b/server/initializers/migrations/0320-blacklist-unfederate.ts new file mode 100644 index 000000000..6fb7bbb90 --- /dev/null +++ b/server/initializers/migrations/0320-blacklist-unfederate.ts @@ -0,0 +1,27 @@ +import * as Sequelize from 'sequelize' + +async function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize +}): Promise { + + { + const data = { + type: Sequelize.BOOLEAN, + allowNull: false, + defaultValue: false + } + + await utils.queryInterface.addColumn('videoBlacklist', 'unfederated', data) + } +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/initializers/migrations/0325-video-abuse-fields.ts b/server/initializers/migrations/0325-video-abuse-fields.ts new file mode 100644 index 000000000..fca6d666f --- /dev/null +++ b/server/initializers/migrations/0325-video-abuse-fields.ts @@ -0,0 +1,37 @@ +import * as Sequelize from 'sequelize' + +async function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize +}): Promise { + + { + const data = { + type: Sequelize.STRING(3000), + allowNull: false, + defaultValue: null + } + + await utils.queryInterface.changeColumn('videoAbuse', 'reason', data) + } + + { + const data = { + type: Sequelize.STRING(3000), + allowNull: true, + defaultValue: null + } + + await utils.queryInterface.changeColumn('videoAbuse', 'moderationComment', data) + } +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/initializers/migrations/0330-video-streaming-playlist.ts b/server/initializers/migrations/0330-video-streaming-playlist.ts new file mode 100644 index 000000000..c85a762ab --- /dev/null +++ b/server/initializers/migrations/0330-video-streaming-playlist.ts @@ -0,0 +1,51 @@ +import * as Sequelize from 'sequelize' + +async function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize +}): Promise { + + { + const query = ` + CREATE TABLE IF NOT EXISTS "videoStreamingPlaylist" +( + "id" SERIAL, + "type" INTEGER NOT NULL, + "playlistUrl" VARCHAR(2000) NOT NULL, + "p2pMediaLoaderInfohashes" VARCHAR(255)[] NOT NULL, + "segmentsSha256Url" VARCHAR(255) NOT NULL, + "videoId" INTEGER NOT NULL REFERENCES "video" ("id") ON DELETE CASCADE ON UPDATE CASCADE, + "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, + "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, + PRIMARY KEY ("id") +);` + await utils.sequelize.query(query) + } + + { + const data = { + type: Sequelize.INTEGER, + allowNull: true, + defaultValue: null + } + + await utils.queryInterface.changeColumn('videoRedundancy', 'videoFileId', data) + } + + { + const query = 'ALTER TABLE "videoRedundancy" ADD COLUMN "videoStreamingPlaylistId" INTEGER NULL ' + + 'REFERENCES "videoStreamingPlaylist" ("id") ON DELETE CASCADE ON UPDATE CASCADE' + + await utils.sequelize.query(query) + } +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/initializers/migrations/0335-video-downloading-enabled.ts b/server/initializers/migrations/0335-video-downloading-enabled.ts new file mode 100644 index 000000000..e79466447 --- /dev/null +++ b/server/initializers/migrations/0335-video-downloading-enabled.ts @@ -0,0 +1,27 @@ +import * as Sequelize from 'sequelize' +import { Migration } from '../../models/migrations' + +async function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize +}): Promise { + const data = { + type: Sequelize.BOOLEAN, + allowNull: false, + defaultValue: true + } as Migration.Boolean + await utils.queryInterface.addColumn('video', 'downloadEnabled', data) + + data.defaultValue = null + return utils.queryInterface.changeColumn('video', 'downloadEnabled', data) +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/initializers/migrations/0295-add-originally-published-at.ts b/server/initializers/migrations/0340-add-originally-published-at.ts similarity index 69% rename from server/initializers/migrations/0295-add-originally-published-at.ts rename to server/initializers/migrations/0340-add-originally-published-at.ts index e02cca480..ab8d66854 100644 --- a/server/initializers/migrations/0295-add-originally-published-at.ts +++ b/server/initializers/migrations/0340-add-originally-published-at.ts @@ -19,17 +19,6 @@ async function up (utils: { const query = 'UPDATE video SET "originallyPublishedAt" = video."publishedAt"' await utils.sequelize.query(query) } - - // Sequelize does not alter the column with NOW as default value - { - const data = { - type: Sequelize.DATE, - allowNull: false, - defaultValue: Sequelize.NOW - } - await utils.queryInterface.changeColumn('video', 'originallyPublishedAt', data) - } - } function down (options) { diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index f7bf7c65a..a3f379b76 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -4,7 +4,7 @@ import * as url from 'url' import * as uuidv4 from 'uuid/v4' import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/activitypub' import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' import { isActorObjectValid, normalizeActor } from '../../helpers/custom-validators/activitypub/actor' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { retryTransactionWrapper, updateInstanceWithAnother } from '../../helpers/database-utils' @@ -42,7 +42,7 @@ async function getOrCreateActorAndServerAndModel ( recurseIfNeeded = true, updateCollections = false ) { - const actorUrl = getAPUrl(activityActor) + const actorUrl = getAPId(activityActor) let created = false let actor = await fetchActorByUrl(actorUrl, fetchType) @@ -201,6 +201,69 @@ async function addFetchOutboxJob (actor: ActorModel) { return JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload }) } +async function refreshActorIfNeeded ( + actorArg: ActorModel, + fetchedType: ActorFetchByUrlType +): Promise<{ actor: ActorModel, refreshed: boolean }> { + if (!actorArg.isOutdated()) return { actor: actorArg, refreshed: false } + + // We need more attributes + const actor = fetchedType === 'all' ? actorArg : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url) + + try { + let actorUrl: string + try { + actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost()) + } catch (err) { + logger.warn('Cannot get actor URL from webfinger, keeping the old one.', err) + actorUrl = actor.url + } + + const { result, statusCode } = await fetchRemoteActor(actorUrl) + + if (statusCode === 404) { + logger.info('Deleting actor %s because there is a 404 in refresh actor.', actor.url) + actor.Account ? actor.Account.destroy() : actor.VideoChannel.destroy() + return { actor: undefined, refreshed: false } + } + + if (result === undefined) { + logger.warn('Cannot fetch remote actor in refresh actor.') + return { actor, refreshed: false } + } + + return sequelizeTypescript.transaction(async t => { + updateInstanceWithAnother(actor, result.actor) + + if (result.avatarName !== undefined) { + await updateActorAvatarInstance(actor, result.avatarName, t) + } + + // Force update + actor.setDataValue('updatedAt', new Date()) + await actor.save({ transaction: t }) + + if (actor.Account) { + actor.Account.set('name', result.name) + actor.Account.set('description', result.summary) + + await actor.Account.save({ transaction: t }) + } else if (actor.VideoChannel) { + actor.VideoChannel.set('name', result.name) + actor.VideoChannel.set('description', result.summary) + actor.VideoChannel.set('support', result.support) + + await actor.VideoChannel.save({ transaction: t }) + } + + return { refreshed: true, actor } + }) + } catch (err) { + logger.warn('Cannot refresh actor.', { err }) + return { actor, refreshed: false } + } +} + export { getOrCreateActorAndServerAndModel, buildActorInstance, @@ -208,6 +271,7 @@ export { fetchActorTotalItems, fetchAvatarIfExists, updateActorInstance, + refreshActorIfNeeded, updateActorAvatarInstance, addFetchOutboxJob } @@ -291,12 +355,12 @@ async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode?: numbe logger.info('Fetching remote actor %s.', actorUrl) - const requestResult = await doRequest(options) + const requestResult = await doRequest(options) normalizeActor(requestResult.body) - const actorJSON: ActivityPubActor = requestResult.body + const actorJSON = requestResult.body if (isActorObjectValid(actorJSON) === false) { - logger.debug('Remote actor JSON is not valid.', { actorJSON: actorJSON }) + logger.debug('Remote actor JSON is not valid.', { actorJSON }) return { result: undefined, statusCode: requestResult.response.statusCode } } @@ -372,59 +436,3 @@ async function saveVideoChannel (actor: ActorModel, result: FetchRemoteActorResu return videoChannelCreated } - -async function refreshActorIfNeeded ( - actorArg: ActorModel, - fetchedType: ActorFetchByUrlType -): Promise<{ actor: ActorModel, refreshed: boolean }> { - if (!actorArg.isOutdated()) return { actor: actorArg, refreshed: false } - - // We need more attributes - const actor = fetchedType === 'all' ? actorArg : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url) - - try { - const actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost()) - const { result, statusCode } = await fetchRemoteActor(actorUrl) - - if (statusCode === 404) { - logger.info('Deleting actor %s because there is a 404 in refresh actor.', actor.url) - actor.Account ? actor.Account.destroy() : actor.VideoChannel.destroy() - return { actor: undefined, refreshed: false } - } - - if (result === undefined) { - logger.warn('Cannot fetch remote actor in refresh actor.') - return { actor, refreshed: false } - } - - return sequelizeTypescript.transaction(async t => { - updateInstanceWithAnother(actor, result.actor) - - if (result.avatarName !== undefined) { - await updateActorAvatarInstance(actor, result.avatarName, t) - } - - // Force update - actor.setDataValue('updatedAt', new Date()) - await actor.save({ transaction: t }) - - if (actor.Account) { - actor.Account.set('name', result.name) - actor.Account.set('description', result.summary) - - await actor.Account.save({ transaction: t }) - } else if (actor.VideoChannel) { - actor.VideoChannel.set('name', result.name) - actor.VideoChannel.set('description', result.summary) - actor.VideoChannel.set('support', result.support) - - await actor.VideoChannel.save({ transaction: t }) - } - - return { refreshed: true, actor } - }) - } catch (err) { - logger.warn('Cannot refresh actor.', { err }) - return { actor, refreshed: false } - } -} diff --git a/server/lib/activitypub/cache-file.ts b/server/lib/activitypub/cache-file.ts index f6f068b45..9a40414bb 100644 --- a/server/lib/activitypub/cache-file.ts +++ b/server/lib/activitypub/cache-file.ts @@ -1,11 +1,28 @@ -import { CacheFileObject } from '../../../shared/index' +import { ActivityPlaylistUrlObject, ActivityVideoUrlObject, CacheFileObject } from '../../../shared/index' import { VideoModel } from '../../models/video/video' import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy' import { Transaction } from 'sequelize' +import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' function cacheFileActivityObjectToDBAttributes (cacheFileObject: CacheFileObject, video: VideoModel, byActor: { id?: number }) { - const url = cacheFileObject.url + if (cacheFileObject.url.mediaType === 'application/x-mpegURL') { + const url = cacheFileObject.url + + const playlist = video.VideoStreamingPlaylists.find(t => t.type === VideoStreamingPlaylistType.HLS) + if (!playlist) throw new Error('Cannot find HLS playlist of video ' + video.url) + + return { + expiresOn: new Date(cacheFileObject.expires), + url: cacheFileObject.id, + fileUrl: url.href, + strategy: null, + videoStreamingPlaylistId: playlist.id, + actorId: byActor.id + } + } + + const url = cacheFileObject.url const videoFile = video.VideoFiles.find(f => { return f.resolution === url.height && f.fps === url.fps }) @@ -15,7 +32,7 @@ function cacheFileActivityObjectToDBAttributes (cacheFileObject: CacheFileObject return { expiresOn: new Date(cacheFileObject.expires), url: cacheFileObject.id, - fileUrl: cacheFileObject.url.href, + fileUrl: url.href, strategy: null, videoFileId: videoFile.id, actorId: byActor.id diff --git a/server/lib/activitypub/process/process-accept.ts b/server/lib/activitypub/process/process-accept.ts index 605705ad3..ebb275e34 100644 --- a/server/lib/activitypub/process/process-accept.ts +++ b/server/lib/activitypub/process/process-accept.ts @@ -2,7 +2,6 @@ import { ActivityAccept } from '../../../../shared/models/activitypub' import { ActorModel } from '../../../models/activitypub/actor' import { ActorFollowModel } from '../../../models/activitypub/actor-follow' import { addFetchOutboxJob } from '../actor' -import { Notifier } from '../../notifier' async function processAcceptActivity (activity: ActivityAccept, targetActor: ActorModel, inboxActor?: ActorModel) { if (inboxActor === undefined) throw new Error('Need to accept on explicit inbox.') diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index 2e04ee843..5f4d793a5 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -1,36 +1,44 @@ -import { ActivityCreate, CacheFileObject, VideoAbuseState, VideoTorrentObject } from '../../../../shared' -import { DislikeObject, VideoAbuseObject, ViewObject } from '../../../../shared/models/activitypub/objects' +import { ActivityCreate, CacheFileObject, VideoTorrentObject } from '../../../../shared' import { VideoCommentObject } from '../../../../shared/models/activitypub/objects/video-comment-object' import { retryTransactionWrapper } from '../../../helpers/database-utils' import { logger } from '../../../helpers/logger' import { sequelizeTypescript } from '../../../initializers' -import { AccountVideoRateModel } from '../../../models/account/account-video-rate' import { ActorModel } from '../../../models/activitypub/actor' -import { VideoAbuseModel } from '../../../models/video/video-abuse' import { addVideoComment, resolveThread } from '../video-comments' import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { forwardVideoRelatedActivity } from '../send/utils' -import { Redis } from '../../redis' import { createOrUpdateCacheFile } from '../cache-file' -import { getVideoDislikeActivityPubUrl } from '../url' import { Notifier } from '../../notifier' +import { processViewActivity } from './process-view' +import { processDislikeActivity } from './process-dislike' +import { processFlagActivity } from './process-flag' async function processCreateActivity (activity: ActivityCreate, byActor: ActorModel) { const activityObject = activity.object const activityType = activityObject.type if (activityType === 'View') { - return processCreateView(byActor, activity) - } else if (activityType === 'Dislike') { - return retryTransactionWrapper(processCreateDislike, byActor, activity) - } else if (activityType === 'Video') { + return processViewActivity(activity, byActor) + } + + if (activityType === 'Dislike') { + return retryTransactionWrapper(processDislikeActivity, activity, byActor) + } + + if (activityType === 'Flag') { + return retryTransactionWrapper(processFlagActivity, activity, byActor) + } + + if (activityType === 'Video') { return processCreateVideo(activity) - } else if (activityType === 'Flag') { - return retryTransactionWrapper(processCreateVideoAbuse, byActor, activityObject as VideoAbuseObject) - } else if (activityType === 'Note') { - return retryTransactionWrapper(processCreateVideoComment, byActor, activity) - } else if (activityType === 'CacheFile') { - return retryTransactionWrapper(processCacheFile, byActor, activity) + } + + if (activityType === 'Note') { + return retryTransactionWrapper(processCreateVideoComment, activity, byActor) + } + + if (activityType === 'CacheFile') { + return retryTransactionWrapper(processCacheFile, activity, byActor) } logger.warn('Unknown activity object type %s when creating activity.', activityType, { activity: activity.id }) @@ -55,56 +63,7 @@ async function processCreateVideo (activity: ActivityCreate) { return video } -async function processCreateDislike (byActor: ActorModel, activity: ActivityCreate) { - const dislike = activity.object as DislikeObject - const byAccount = byActor.Account - - if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) - - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislike.object }) - - return sequelizeTypescript.transaction(async t => { - const rate = { - type: 'dislike' as 'dislike', - videoId: video.id, - accountId: byAccount.id - } - - const [ , created ] = await AccountVideoRateModel.findOrCreate({ - where: rate, - defaults: Object.assign({}, rate, { url: getVideoDislikeActivityPubUrl(byActor, video) }), - transaction: t - }) - if (created === true) await video.increment('dislikes', { transaction: t }) - - if (video.isOwned() && created === true) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - - await forwardVideoRelatedActivity(activity, t, exceptions, video) - } - }) -} - -async function processCreateView (byActor: ActorModel, activity: ActivityCreate) { - const view = activity.object as ViewObject - - const options = { - videoObject: view.object, - fetchType: 'only-video' as 'only-video' - } - const { video } = await getOrCreateVideoAndAccountAndChannel(options) - - await Redis.Instance.addVideoView(video.id) - - if (video.isOwned()) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - await forwardVideoRelatedActivity(activity, undefined, exceptions, video) - } -} - -async function processCacheFile (byActor: ActorModel, activity: ActivityCreate) { +async function processCacheFile (activity: ActivityCreate, byActor: ActorModel) { const cacheFile = activity.object as CacheFileObject const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFile.object }) @@ -120,32 +79,7 @@ async function processCacheFile (byActor: ActorModel, activity: ActivityCreate) } } -async function processCreateVideoAbuse (byActor: ActorModel, videoAbuseToCreateData: VideoAbuseObject) { - logger.debug('Reporting remote abuse for video %s.', videoAbuseToCreateData.object) - - const account = byActor.Account - if (!account) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) - - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoAbuseToCreateData.object }) - - return sequelizeTypescript.transaction(async t => { - const videoAbuseData = { - reporterAccountId: account.id, - reason: videoAbuseToCreateData.content, - videoId: video.id, - state: VideoAbuseState.PENDING - } - - const videoAbuseInstance = await VideoAbuseModel.create(videoAbuseData, { transaction: t }) - videoAbuseInstance.Video = video - - Notifier.Instance.notifyOnNewVideoAbuse(videoAbuseInstance) - - logger.info('Remote abuse for video uuid %s created', videoAbuseToCreateData.object) - }) -} - -async function processCreateVideoComment (byActor: ActorModel, activity: ActivityCreate) { +async function processCreateVideoComment (activity: ActivityCreate, byActor: ActorModel) { const commentObject = activity.object as VideoCommentObject const byAccount = byActor.Account diff --git a/server/lib/activitypub/process/process-dislike.ts b/server/lib/activitypub/process/process-dislike.ts new file mode 100644 index 000000000..bfd69e07a --- /dev/null +++ b/server/lib/activitypub/process/process-dislike.ts @@ -0,0 +1,52 @@ +import { ActivityCreate, ActivityDislike } from '../../../../shared' +import { DislikeObject } from '../../../../shared/models/activitypub/objects' +import { retryTransactionWrapper } from '../../../helpers/database-utils' +import { sequelizeTypescript } from '../../../initializers' +import { AccountVideoRateModel } from '../../../models/account/account-video-rate' +import { ActorModel } from '../../../models/activitypub/actor' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' +import { forwardVideoRelatedActivity } from '../send/utils' +import { getVideoDislikeActivityPubUrl } from '../url' + +async function processDislikeActivity (activity: ActivityCreate | ActivityDislike, byActor: ActorModel) { + return retryTransactionWrapper(processDislike, activity, byActor) +} + +// --------------------------------------------------------------------------- + +export { + processDislikeActivity +} + +// --------------------------------------------------------------------------- + +async function processDislike (activity: ActivityCreate | ActivityDislike, byActor: ActorModel) { + const dislikeObject = activity.type === 'Dislike' ? activity.object : (activity.object as DislikeObject).object + const byAccount = byActor.Account + + if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) + + const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislikeObject }) + + return sequelizeTypescript.transaction(async t => { + const rate = { + type: 'dislike' as 'dislike', + videoId: video.id, + accountId: byAccount.id + } + + const [ , created ] = await AccountVideoRateModel.findOrCreate({ + where: rate, + defaults: Object.assign({}, rate, { url: getVideoDislikeActivityPubUrl(byActor, video) }), + transaction: t + }) + if (created === true) await video.increment('dislikes', { transaction: t }) + + if (video.isOwned() && created === true) { + // Don't resend the activity to the sender + const exceptions = [ byActor ] + + await forwardVideoRelatedActivity(activity, t, exceptions, video) + } + }) +} diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts new file mode 100644 index 000000000..79ce6fb41 --- /dev/null +++ b/server/lib/activitypub/process/process-flag.ts @@ -0,0 +1,49 @@ +import { ActivityCreate, ActivityFlag, VideoAbuseState } from '../../../../shared' +import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects' +import { retryTransactionWrapper } from '../../../helpers/database-utils' +import { logger } from '../../../helpers/logger' +import { sequelizeTypescript } from '../../../initializers' +import { ActorModel } from '../../../models/activitypub/actor' +import { VideoAbuseModel } from '../../../models/video/video-abuse' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' +import { Notifier } from '../../notifier' +import { getAPId } from '../../../helpers/activitypub' + +async function processFlagActivity (activity: ActivityCreate | ActivityFlag, byActor: ActorModel) { + return retryTransactionWrapper(processCreateVideoAbuse, activity, byActor) +} + +// --------------------------------------------------------------------------- + +export { + processFlagActivity +} + +// --------------------------------------------------------------------------- + +async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, byActor: ActorModel) { + const flag = activity.type === 'Flag' ? activity : (activity.object as VideoAbuseObject) + + logger.debug('Reporting remote abuse for video %s.', getAPId(flag.object)) + + const account = byActor.Account + if (!account) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) + + const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: flag.object }) + + return sequelizeTypescript.transaction(async t => { + const videoAbuseData = { + reporterAccountId: account.id, + reason: flag.content, + videoId: video.id, + state: VideoAbuseState.PENDING + } + + const videoAbuseInstance = await VideoAbuseModel.create(videoAbuseData, { transaction: t }) + videoAbuseInstance.Video = video + + Notifier.Instance.notifyOnNewVideoAbuse(videoAbuseInstance) + + logger.info('Remote abuse for video uuid %s created', flag.object) + }) +} diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts index a67892440..0cd537187 100644 --- a/server/lib/activitypub/process/process-follow.ts +++ b/server/lib/activitypub/process/process-follow.ts @@ -6,9 +6,10 @@ import { ActorModel } from '../../../models/activitypub/actor' import { ActorFollowModel } from '../../../models/activitypub/actor-follow' import { sendAccept } from '../send' import { Notifier } from '../../notifier' +import { getAPId } from '../../../helpers/activitypub' async function processFollowActivity (activity: ActivityFollow, byActor: ActorModel) { - const activityObject = activity.object + const activityObject = getAPId(activity.object) return retryTransactionWrapper(processFollow, byActor, activityObject) } diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts index e8e97eece..2a04167d7 100644 --- a/server/lib/activitypub/process/process-like.ts +++ b/server/lib/activitypub/process/process-like.ts @@ -6,6 +6,7 @@ import { ActorModel } from '../../../models/activitypub/actor' import { forwardVideoRelatedActivity } from '../send/utils' import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { getVideoLikeActivityPubUrl } from '../url' +import { getAPId } from '../../../helpers/activitypub' async function processLikeActivity (activity: ActivityLike, byActor: ActorModel) { return retryTransactionWrapper(processLikeVideo, byActor, activity) @@ -20,7 +21,7 @@ export { // --------------------------------------------------------------------------- async function processLikeVideo (byActor: ActorModel, activity: ActivityLike) { - const videoUrl = activity.object + const videoUrl = getAPId(activity.object) const byAccount = byActor.Account if (!byAccount) throw new Error('Cannot create like with the non account actor ' + byActor.url) diff --git a/server/lib/activitypub/process/process-undo.ts b/server/lib/activitypub/process/process-undo.ts index 438a013b6..ed0177a67 100644 --- a/server/lib/activitypub/process/process-undo.ts +++ b/server/lib/activitypub/process/process-undo.ts @@ -26,6 +26,10 @@ async function processUndoActivity (activity: ActivityUndo, byActor: ActorModel) } } + if (activityToUndo.type === 'Dislike') { + return retryTransactionWrapper(processUndoDislike, byActor, activity) + } + if (activityToUndo.type === 'Follow') { return retryTransactionWrapper(processUndoFollow, byActor, activityToUndo) } @@ -72,7 +76,9 @@ async function processUndoLike (byActor: ActorModel, activity: ActivityUndo) { } async function processUndoDislike (byActor: ActorModel, activity: ActivityUndo) { - const dislike = activity.object.object as DislikeObject + const dislike = activity.object.type === 'Dislike' + ? activity.object + : activity.object.object as DislikeObject const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislike.object }) diff --git a/server/lib/activitypub/process/process-view.ts b/server/lib/activitypub/process/process-view.ts new file mode 100644 index 000000000..8f66d3630 --- /dev/null +++ b/server/lib/activitypub/process/process-view.ts @@ -0,0 +1,35 @@ +import { ActorModel } from '../../../models/activitypub/actor' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' +import { forwardVideoRelatedActivity } from '../send/utils' +import { Redis } from '../../redis' +import { ActivityCreate, ActivityView, ViewObject } from '../../../../shared/models/activitypub' + +async function processViewActivity (activity: ActivityView | ActivityCreate, byActor: ActorModel) { + return processCreateView(activity, byActor) +} + +// --------------------------------------------------------------------------- + +export { + processViewActivity +} + +// --------------------------------------------------------------------------- + +async function processCreateView (activity: ActivityView | ActivityCreate, byActor: ActorModel) { + const videoObject = activity.type === 'View' ? activity.object : (activity.object as ViewObject).object + + const options = { + videoObject: videoObject, + fetchType: 'only-video' as 'only-video' + } + const { video } = await getOrCreateVideoAndAccountAndChannel(options) + + await Redis.Instance.addVideoView(video.id) + + if (video.isOwned()) { + // Don't resend the activity to the sender + const exceptions = [ byActor ] + await forwardVideoRelatedActivity(activity, undefined, exceptions, video) + } +} diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts index bcc5cac7a..9dd241402 100644 --- a/server/lib/activitypub/process/process.ts +++ b/server/lib/activitypub/process/process.ts @@ -1,5 +1,5 @@ import { Activity, ActivityType } from '../../../../shared/models/activitypub' -import { checkUrlsSameHost, getAPUrl } from '../../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../../helpers/activitypub' import { logger } from '../../../helpers/logger' import { ActorModel } from '../../../models/activitypub/actor' import { processAcceptActivity } from './process-accept' @@ -12,6 +12,9 @@ import { processRejectActivity } from './process-reject' import { processUndoActivity } from './process-undo' import { processUpdateActivity } from './process-update' import { getOrCreateActorAndServerAndModel } from '../actor' +import { processDislikeActivity } from './process-dislike' +import { processFlagActivity } from './process-flag' +import { processViewActivity } from './process-view' const processActivity: { [ P in ActivityType ]: (activity: Activity, byActor: ActorModel, inboxActor?: ActorModel) => Promise } = { Create: processCreateActivity, @@ -22,7 +25,10 @@ const processActivity: { [ P in ActivityType ]: (activity: Activity, byActor: Ac Reject: processRejectActivity, Announce: processAnnounceActivity, Undo: processUndoActivity, - Like: processLikeActivity + Like: processLikeActivity, + Dislike: processDislikeActivity, + Flag: processFlagActivity, + View: processViewActivity } async function processActivities ( @@ -35,12 +41,12 @@ async function processActivities ( const actorsCache: { [ url: string ]: ActorModel } = {} for (const activity of activities) { - if (!options.signatureActor && [ 'Create', 'Announce', 'Like' ].indexOf(activity.type) === -1) { + if (!options.signatureActor && [ 'Create', 'Announce', 'Like' ].includes(activity.type) === false) { logger.error('Cannot process activity %s (type: %s) without the actor signature.', activity.id, activity.type) continue } - const actorUrl = getAPUrl(activity.actor) + const actorUrl = getAPId(activity.actor) // When we fetch remote data, we don't have signature if (options.signatureActor && actorUrl !== options.signatureActor.url) { diff --git a/server/lib/activitypub/send/send-create.ts b/server/lib/activitypub/send/send-create.ts index e3fca0a17..ef20e404c 100644 --- a/server/lib/activitypub/send/send-create.ts +++ b/server/lib/activitypub/send/send-create.ts @@ -3,9 +3,7 @@ import { ActivityAudience, ActivityCreate } from '../../../../shared/models/acti import { VideoPrivacy } from '../../../../shared/models/videos' import { ActorModel } from '../../../models/activitypub/actor' import { VideoModel } from '../../../models/video/video' -import { VideoAbuseModel } from '../../../models/video/video-abuse' import { VideoCommentModel } from '../../../models/video/video-comment' -import { getVideoAbuseActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoViewActivityPubUrl } from '../url' import { broadcastToActors, broadcastToFollowers, sendVideoRelatedActivity, unicastTo } from './utils' import { audiencify, getActorsInvolvedInVideo, getAudience, getAudienceFromFollowersOf, getVideoCommentAudience } from '../audience' import { logger } from '../../../helpers/logger' @@ -25,31 +23,14 @@ async function sendCreateVideo (video: VideoModel, t: Transaction) { return broadcastToFollowers(createActivity, byActor, [ byActor ], t) } -async function sendVideoAbuse (byActor: ActorModel, videoAbuse: VideoAbuseModel, video: VideoModel) { - if (!video.VideoChannel.Account.Actor.serverId) return // Local - - const url = getVideoAbuseActivityPubUrl(videoAbuse) - - logger.info('Creating job to send video abuse %s.', url) - - // Custom audience, we only send the abuse to the origin instance - const audience = { to: [ video.VideoChannel.Account.Actor.url ], cc: [] } - const createActivity = buildCreateActivity(url, byActor, videoAbuse.toActivityPubObject(), audience) - - return unicastTo(createActivity, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) -} - -async function sendCreateCacheFile (byActor: ActorModel, fileRedundancy: VideoRedundancyModel) { +async function sendCreateCacheFile (byActor: ActorModel, video: VideoModel, fileRedundancy: VideoRedundancyModel) { logger.info('Creating job to send file cache of %s.', fileRedundancy.url) - const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(fileRedundancy.VideoFile.Video.id) - const redundancyObject = fileRedundancy.toActivityPubObject() - return sendVideoRelatedCreateActivity({ byActor, video, url: fileRedundancy.url, - object: redundancyObject + object: fileRedundancy.toActivityPubObject() }) } @@ -91,37 +72,6 @@ async function sendCreateVideoComment (comment: VideoCommentModel, t: Transactio return unicastTo(createActivity, byActor, comment.Video.VideoChannel.Account.Actor.sharedInboxUrl) } -async function sendCreateView (byActor: ActorModel, video: VideoModel, t: Transaction) { - logger.info('Creating job to send view of %s.', video.url) - - const url = getVideoViewActivityPubUrl(byActor, video) - const viewActivity = buildViewActivity(url, byActor, video) - - return sendVideoRelatedCreateActivity({ - // Use the server actor to send the view - byActor, - video, - url, - object: viewActivity, - transaction: t - }) -} - -async function sendCreateDislike (byActor: ActorModel, video: VideoModel, t: Transaction) { - logger.info('Creating job to dislike %s.', video.url) - - const url = getVideoDislikeActivityPubUrl(byActor, video) - const dislikeActivity = buildDislikeActivity(url, byActor, video) - - return sendVideoRelatedCreateActivity({ - byActor, - video, - url, - object: dislikeActivity, - transaction: t - }) -} - function buildCreateActivity (url: string, byActor: ActorModel, object: any, audience?: ActivityAudience): ActivityCreate { if (!audience) audience = getAudience(byActor) @@ -136,33 +86,11 @@ function buildCreateActivity (url: string, byActor: ActorModel, object: any, aud ) } -function buildDislikeActivity (url: string, byActor: ActorModel, video: VideoModel) { - return { - id: url, - type: 'Dislike', - actor: byActor.url, - object: video.url - } -} - -function buildViewActivity (url: string, byActor: ActorModel, video: VideoModel) { - return { - id: url, - type: 'View', - actor: byActor.url, - object: video.url - } -} - // --------------------------------------------------------------------------- export { sendCreateVideo, - sendVideoAbuse, buildCreateActivity, - sendCreateView, - sendCreateDislike, - buildDislikeActivity, sendCreateVideoComment, sendCreateCacheFile } diff --git a/server/lib/activitypub/send/send-dislike.ts b/server/lib/activitypub/send/send-dislike.ts new file mode 100644 index 000000000..a88436f2c --- /dev/null +++ b/server/lib/activitypub/send/send-dislike.ts @@ -0,0 +1,41 @@ +import { Transaction } from 'sequelize' +import { ActorModel } from '../../../models/activitypub/actor' +import { VideoModel } from '../../../models/video/video' +import { getVideoDislikeActivityPubUrl } from '../url' +import { logger } from '../../../helpers/logger' +import { ActivityAudience, ActivityDislike } from '../../../../shared/models/activitypub' +import { sendVideoRelatedActivity } from './utils' +import { audiencify, getAudience } from '../audience' + +async function sendDislike (byActor: ActorModel, video: VideoModel, t: Transaction) { + logger.info('Creating job to dislike %s.', video.url) + + const activityBuilder = (audience: ActivityAudience) => { + const url = getVideoDislikeActivityPubUrl(byActor, video) + + return buildDislikeActivity(url, byActor, video, audience) + } + + return sendVideoRelatedActivity(activityBuilder, { byActor, video, transaction: t }) +} + +function buildDislikeActivity (url: string, byActor: ActorModel, video: VideoModel, audience?: ActivityAudience): ActivityDislike { + if (!audience) audience = getAudience(byActor) + + return audiencify( + { + id: url, + type: 'Dislike' as 'Dislike', + actor: byActor.url, + object: video.url + }, + audience + ) +} + +// --------------------------------------------------------------------------- + +export { + sendDislike, + buildDislikeActivity +} diff --git a/server/lib/activitypub/send/send-flag.ts b/server/lib/activitypub/send/send-flag.ts new file mode 100644 index 000000000..96a7311b9 --- /dev/null +++ b/server/lib/activitypub/send/send-flag.ts @@ -0,0 +1,39 @@ +import { ActorModel } from '../../../models/activitypub/actor' +import { VideoModel } from '../../../models/video/video' +import { VideoAbuseModel } from '../../../models/video/video-abuse' +import { getVideoAbuseActivityPubUrl } from '../url' +import { unicastTo } from './utils' +import { logger } from '../../../helpers/logger' +import { ActivityAudience, ActivityFlag } from '../../../../shared/models/activitypub' +import { audiencify, getAudience } from '../audience' + +async function sendVideoAbuse (byActor: ActorModel, videoAbuse: VideoAbuseModel, video: VideoModel) { + if (!video.VideoChannel.Account.Actor.serverId) return // Local user + + const url = getVideoAbuseActivityPubUrl(videoAbuse) + + logger.info('Creating job to send video abuse %s.', url) + + // Custom audience, we only send the abuse to the origin instance + const audience = { to: [ video.VideoChannel.Account.Actor.url ], cc: [] } + const flagActivity = buildFlagActivity(url, byActor, videoAbuse, audience) + + return unicastTo(flagActivity, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl) +} + +function buildFlagActivity (url: string, byActor: ActorModel, videoAbuse: VideoAbuseModel, audience: ActivityAudience): ActivityFlag { + if (!audience) audience = getAudience(byActor) + + const activity = Object.assign( + { id: url, actor: byActor.url }, + videoAbuse.toActivityPubObject() + ) + + return audiencify(activity, audience) +} + +// --------------------------------------------------------------------------- + +export { + sendVideoAbuse +} diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts index bf1b6e117..ecbf605d6 100644 --- a/server/lib/activitypub/send/send-undo.ts +++ b/server/lib/activitypub/send/send-undo.ts @@ -2,7 +2,7 @@ import { Transaction } from 'sequelize' import { ActivityAnnounce, ActivityAudience, - ActivityCreate, + ActivityCreate, ActivityDislike, ActivityFollow, ActivityLike, ActivityUndo @@ -13,13 +13,14 @@ import { VideoModel } from '../../../models/video/video' import { getActorFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url' import { broadcastToFollowers, sendVideoRelatedActivity, unicastTo } from './utils' import { audiencify, getAudience } from '../audience' -import { buildCreateActivity, buildDislikeActivity } from './send-create' +import { buildCreateActivity } from './send-create' import { buildFollowActivity } from './send-follow' import { buildLikeActivity } from './send-like' import { VideoShareModel } from '../../../models/video/video-share' import { buildAnnounceWithVideoAudience } from './send-announce' import { logger } from '../../../helpers/logger' import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' +import { buildDislikeActivity } from './send-dislike' async function sendUndoFollow (actorFollow: ActorFollowModel, t: Transaction) { const me = actorFollow.ActorFollower @@ -65,15 +66,15 @@ async function sendUndoDislike (byActor: ActorModel, video: VideoModel, t: Trans const dislikeUrl = getVideoDislikeActivityPubUrl(byActor, video) const dislikeActivity = buildDislikeActivity(dislikeUrl, byActor, video) - const createDislikeActivity = buildCreateActivity(dislikeUrl, byActor, dislikeActivity) - return sendUndoVideoRelatedActivity({ byActor, video, url: dislikeUrl, activity: createDislikeActivity, transaction: t }) + return sendUndoVideoRelatedActivity({ byActor, video, url: dislikeUrl, activity: dislikeActivity, transaction: t }) } async function sendUndoCacheFile (byActor: ActorModel, redundancyModel: VideoRedundancyModel, t: Transaction) { logger.info('Creating job to undo cache file %s.', redundancyModel.url) - const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(redundancyModel.VideoFile.Video.id) + const videoId = redundancyModel.getVideo().id + const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId) const createActivity = buildCreateActivity(redundancyModel.url, byActor, redundancyModel.toActivityPubObject()) return sendUndoVideoRelatedActivity({ byActor, video, url: redundancyModel.url, activity: createActivity, transaction: t }) @@ -94,7 +95,7 @@ export { function undoActivityData ( url: string, byActor: ActorModel, - object: ActivityFollow | ActivityLike | ActivityCreate | ActivityAnnounce, + object: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce, audience?: ActivityAudience ): ActivityUndo { if (!audience) audience = getAudience(byActor) @@ -114,7 +115,7 @@ async function sendUndoVideoRelatedActivity (options: { byActor: ActorModel, video: VideoModel, url: string, - activity: ActivityFollow | ActivityLike | ActivityCreate | ActivityAnnounce, + activity: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce, transaction: Transaction }) { const activityBuilder = (audience: ActivityAudience) => { diff --git a/server/lib/activitypub/send/send-update.ts b/server/lib/activitypub/send/send-update.ts index a68f03edf..839f66470 100644 --- a/server/lib/activitypub/send/send-update.ts +++ b/server/lib/activitypub/send/send-update.ts @@ -61,7 +61,7 @@ async function sendUpdateActor (accountOrChannel: AccountModel | VideoChannelMod async function sendUpdateCacheFile (byActor: ActorModel, redundancyModel: VideoRedundancyModel) { logger.info('Creating job to update cache file %s.', redundancyModel.url) - const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(redundancyModel.VideoFile.Video.id) + const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(redundancyModel.getVideo().id) const activityBuilder = (audience: ActivityAudience) => { const redundancyObject = redundancyModel.toActivityPubObject() diff --git a/server/lib/activitypub/send/send-view.ts b/server/lib/activitypub/send/send-view.ts new file mode 100644 index 000000000..8ad126be0 --- /dev/null +++ b/server/lib/activitypub/send/send-view.ts @@ -0,0 +1,40 @@ +import { Transaction } from 'sequelize' +import { ActivityAudience, ActivityView } from '../../../../shared/models/activitypub' +import { ActorModel } from '../../../models/activitypub/actor' +import { VideoModel } from '../../../models/video/video' +import { getVideoLikeActivityPubUrl } from '../url' +import { sendVideoRelatedActivity } from './utils' +import { audiencify, getAudience } from '../audience' +import { logger } from '../../../helpers/logger' + +async function sendView (byActor: ActorModel, video: VideoModel, t: Transaction) { + logger.info('Creating job to send view of %s.', video.url) + + const activityBuilder = (audience: ActivityAudience) => { + const url = getVideoLikeActivityPubUrl(byActor, video) + + return buildViewActivity(url, byActor, video, audience) + } + + return sendVideoRelatedActivity(activityBuilder, { byActor, video, transaction: t }) +} + +function buildViewActivity (url: string, byActor: ActorModel, video: VideoModel, audience?: ActivityAudience): ActivityView { + if (!audience) audience = getAudience(byActor) + + return audiencify( + { + id: url, + type: 'View' as 'View', + actor: byActor.url, + object: video.url + }, + audience + ) +} + +// --------------------------------------------------------------------------- + +export { + sendView +} diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts index 5dcba778c..1767df0ae 100644 --- a/server/lib/activitypub/share.ts +++ b/server/lib/activitypub/share.ts @@ -11,7 +11,7 @@ import { doRequest } from '../../helpers/requests' import { getOrCreateActorAndServerAndModel } from './actor' import { logger } from '../../helpers/logger' import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' async function shareVideoByServerAndChannel (video: VideoModel, t: Transaction) { if (video.privacy === VideoPrivacy.PRIVATE) return undefined @@ -41,7 +41,7 @@ async function addVideoShares (shareUrls: string[], instance: VideoModel) { }) if (!body || !body.actor) throw new Error('Body or body actor is invalid') - const actorUrl = getAPUrl(body.actor) + const actorUrl = getAPId(body.actor) if (checkUrlsSameHost(shareUrl, actorUrl) !== true) { throw new Error(`Actor url ${actorUrl} has not the same host than the share url ${shareUrl}`) } @@ -78,7 +78,7 @@ async function shareByServer (video: VideoModel, t: Transaction) { const serverActor = await getServerActor() const serverShareUrl = getVideoAnnounceActivityPubUrl(serverActor, video) - return VideoShareModel.findOrCreate({ + const [ serverShare ] = await VideoShareModel.findOrCreate({ defaults: { actorId: serverActor.id, videoId: video.id, @@ -88,16 +88,14 @@ async function shareByServer (video: VideoModel, t: Transaction) { url: serverShareUrl }, transaction: t - }).then(([ serverShare, created ]) => { - if (created) return sendVideoAnnounce(serverActor, serverShare, video, t) - - return undefined }) + + return sendVideoAnnounce(serverActor, serverShare, video, t) } async function shareByVideoChannel (video: VideoModel, t: Transaction) { const videoChannelShareUrl = getVideoAnnounceActivityPubUrl(video.VideoChannel.Actor, video) - return VideoShareModel.findOrCreate({ + const [ videoChannelShare ] = await VideoShareModel.findOrCreate({ defaults: { actorId: video.VideoChannel.actorId, videoId: video.id, @@ -107,11 +105,9 @@ async function shareByVideoChannel (video: VideoModel, t: Transaction) { url: videoChannelShareUrl }, transaction: t - }).then(([ videoChannelShare, created ]) => { - if (created) return sendVideoAnnounce(video.VideoChannel.Actor, videoChannelShare, video, t) - - return undefined }) + + return sendVideoAnnounce(video.VideoChannel.Actor, videoChannelShare, video, t) } async function undoShareByVideoChannel (video: VideoModel, oldVideoChannel: VideoChannelModel, t: Transaction) { diff --git a/server/lib/activitypub/url.ts b/server/lib/activitypub/url.ts index 38f15448c..4229fe094 100644 --- a/server/lib/activitypub/url.ts +++ b/server/lib/activitypub/url.ts @@ -5,6 +5,8 @@ import { VideoModel } from '../../models/video/video' import { VideoAbuseModel } from '../../models/video/video-abuse' import { VideoCommentModel } from '../../models/video/video-comment' import { VideoFileModel } from '../../models/video/video-file' +import { VideoStreamingPlaylist } from '../../../shared/models/videos/video-streaming-playlist.model' +import { VideoStreamingPlaylistModel } from '../../models/video/video-streaming-playlist' function getVideoActivityPubUrl (video: VideoModel) { return CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid @@ -16,6 +18,10 @@ function getVideoCacheFileActivityPubUrl (videoFile: VideoFileModel) { return `${CONFIG.WEBSERVER.URL}/redundancy/videos/${videoFile.Video.uuid}/${videoFile.resolution}${suffixFPS}` } +function getVideoCacheStreamingPlaylistActivityPubUrl (video: VideoModel, playlist: VideoStreamingPlaylistModel) { + return `${CONFIG.WEBSERVER.URL}/redundancy/video-playlists/${playlist.getStringType()}/${video.uuid}` +} + function getVideoCommentActivityPubUrl (video: VideoModel, videoComment: VideoCommentModel) { return CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid + '/comments/' + videoComment.id } @@ -92,6 +98,7 @@ function getUndoActivityPubUrl (originalUrl: string) { export { getVideoActivityPubUrl, + getVideoCacheStreamingPlaylistActivityPubUrl, getVideoChannelActivityPubUrl, getAccountActivityPubUrl, getVideoAbuseActivityPubUrl, diff --git a/server/lib/activitypub/video-rates.ts b/server/lib/activitypub/video-rates.ts index 2cce67f0c..7aac79118 100644 --- a/server/lib/activitypub/video-rates.ts +++ b/server/lib/activitypub/video-rates.ts @@ -1,7 +1,7 @@ import { Transaction } from 'sequelize' import { AccountModel } from '../../models/account/account' import { VideoModel } from '../../models/video/video' -import { sendCreateDislike, sendLike, sendUndoDislike, sendUndoLike } from './send' +import { sendLike, sendUndoDislike, sendUndoLike } from './send' import { VideoRateType } from '../../../shared/models/videos' import * as Bluebird from 'bluebird' import { getOrCreateActorAndServerAndModel } from './actor' @@ -9,9 +9,10 @@ import { AccountVideoRateModel } from '../../models/account/account-video-rate' import { logger } from '../../helpers/logger' import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers' import { doRequest } from '../../helpers/requests' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' import { ActorModel } from '../../models/activitypub/actor' import { getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from './url' +import { sendDislike } from './send/send-dislike' async function createRates (ratesUrl: string[], video: VideoModel, rate: VideoRateType) { let rateCounts = 0 @@ -26,7 +27,7 @@ async function createRates (ratesUrl: string[], video: VideoModel, rate: VideoRa }) if (!body || !body.actor) throw new Error('Body or body actor is invalid') - const actorUrl = getAPUrl(body.actor) + const actorUrl = getAPId(body.actor) if (checkUrlsSameHost(actorUrl, rateUrl) !== true) { throw new Error(`Rate url ${rateUrl} has not the same host than actor url ${actorUrl}`) } @@ -82,7 +83,7 @@ async function sendVideoRateChange (account: AccountModel, // Like if (likes > 0) await sendLike(actor, video, t) // Dislike - if (dislikes > 0) await sendCreateDislike(actor, video, t) + if (dislikes > 0) await sendDislike(actor, video, t) } function getRateUrl (rateType: VideoRateType, actor: ActorModel, video: VideoModel) { diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 893768769..710929aac 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -2,7 +2,14 @@ import * as Bluebird from 'bluebird' import * as sequelize from 'sequelize' import * as magnetUtil from 'magnet-uri' import * as request from 'request' -import { ActivityIconObject, ActivityUrlObject, ActivityVideoUrlObject, VideoState } from '../../../shared/index' +import { + ActivityIconObject, + ActivityPlaylistSegmentHashesObject, + ActivityPlaylistUrlObject, + ActivityUrlObject, + ActivityVideoUrlObject, + VideoState +} from '../../../shared/index' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { VideoPrivacy } from '../../../shared/models/videos' import { sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos' @@ -28,8 +35,11 @@ import { createRates } from './video-rates' import { addVideoShares, shareVideoByServerAndChannel } from './share' import { AccountModel } from '../../models/account/account' import { fetchVideoByUrl, VideoFetchByUrlType } from '../../helpers/video' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' import { Notifier } from '../notifier' +import { VideoStreamingPlaylistModel } from '../../models/video/video-streaming-playlist' +import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' +import { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model' async function federateVideoIfNeeded (video: VideoModel, isNewVideo: boolean, transaction?: sequelize.Transaction) { // If the video is not private and published, we federate it @@ -155,7 +165,7 @@ async function syncVideoExternalAttributes (video: VideoModel, fetchedVideo: Vid } async function getOrCreateVideoAndAccountAndChannel (options: { - videoObject: VideoTorrentObject | string, + videoObject: { id: string } | string, syncParam?: SyncParam, fetchType?: VideoFetchByUrlType, allowRefresh?: boolean // true by default @@ -166,7 +176,7 @@ async function getOrCreateVideoAndAccountAndChannel (options: { const allowRefresh = options.allowRefresh !== false // Get video url - const videoUrl = getAPUrl(options.videoObject) + const videoUrl = getAPId(options.videoObject) let videoFromDatabase = await fetchVideoByUrl(videoUrl, fetchType) if (videoFromDatabase) { @@ -179,7 +189,7 @@ async function getOrCreateVideoAndAccountAndChannel (options: { } if (syncParam.refreshVideo === true) videoFromDatabase = await refreshVideoIfNeeded(refreshOptions) - else await JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', videoUrl: videoFromDatabase.url } }) + else await JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: videoFromDatabase.url } }) } return { video: videoFromDatabase, created: false } @@ -233,6 +243,7 @@ async function updateVideoFromAP (options: { options.video.set('support', videoData.support) options.video.set('nsfw', videoData.nsfw) options.video.set('commentsEnabled', videoData.commentsEnabled) + options.video.set('downloadEnabled', videoData.downloadEnabled) options.video.set('waitTranscoding', videoData.waitTranscoding) options.video.set('state', videoData.state) options.video.set('duration', videoData.duration) @@ -263,6 +274,25 @@ async function updateVideoFromAP (options: { options.video.VideoFiles = await Promise.all(upsertTasks) } + { + const streamingPlaylistAttributes = streamingPlaylistActivityUrlToDBAttributes(options.video, options.videoObject) + const newStreamingPlaylists = streamingPlaylistAttributes.map(a => new VideoStreamingPlaylistModel(a)) + + // Remove video files that do not exist anymore + const destroyTasks = options.video.VideoStreamingPlaylists + .filter(f => !newStreamingPlaylists.find(newPlaylist => newPlaylist.hasSameUniqueKeysThan(f))) + .map(f => f.destroy(sequelizeOptions)) + await Promise.all(destroyTasks) + + // Update or add other one + const upsertTasks = streamingPlaylistAttributes.map(a => { + return VideoStreamingPlaylistModel.upsert(a, { returning: true, transaction: t }) + .then(([ streamingPlaylist ]) => streamingPlaylist) + }) + + options.video.VideoStreamingPlaylists = await Promise.all(upsertTasks) + } + { // Update Tags const tags = options.videoObject.tag.map(tag => tag.name) @@ -367,13 +397,25 @@ export { // --------------------------------------------------------------------------- -function isActivityVideoUrlObject (url: ActivityUrlObject): url is ActivityVideoUrlObject { +function isAPVideoUrlObject (url: ActivityUrlObject): url is ActivityVideoUrlObject { const mimeTypes = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT) const urlMediaType = url.mediaType || url.mimeType return mimeTypes.indexOf(urlMediaType) !== -1 && urlMediaType.startsWith('video/') } +function isAPStreamingPlaylistUrlObject (url: ActivityUrlObject): url is ActivityPlaylistUrlObject { + const urlMediaType = url.mediaType || url.mimeType + + return urlMediaType === 'application/x-mpegURL' +} + +function isAPPlaylistSegmentHashesUrlObject (tag: any): tag is ActivityPlaylistSegmentHashesObject { + const urlMediaType = tag.mediaType || tag.mimeType + + return tag.name === 'sha256' && tag.type === 'Link' && urlMediaType === 'application/json' +} + async function createVideo (videoObject: VideoTorrentObject, channelActor: ActorModel, waitThumbnail = false) { logger.debug('Adding remote video %s.', videoObject.id) @@ -394,8 +436,14 @@ async function createVideo (videoObject: VideoTorrentObject, channelActor: Actor const videoFilePromises = videoFileAttributes.map(f => VideoFileModel.create(f, { transaction: t })) await Promise.all(videoFilePromises) + const videoStreamingPlaylists = streamingPlaylistActivityUrlToDBAttributes(videoCreated, videoObject) + const playlistPromises = videoStreamingPlaylists.map(p => VideoStreamingPlaylistModel.create(p, { transaction: t })) + await Promise.all(playlistPromises) + // Process tags - const tags = videoObject.tag.map(t => t.name) + const tags = videoObject.tag + .filter(t => t.type === 'Hashtag') + .map(t => t.name) const tagInstances = await TagModel.findOrCreateTags(tags, t) await videoCreated.$set('Tags', tagInstances, sequelizeOptions) @@ -456,6 +504,7 @@ async function videoActivityObjectToDBAttributes ( support, nsfw: videoObject.sensitive, commentsEnabled: videoObject.commentsEnabled, + downloadEnabled: videoObject.downloadEnabled, waitTranscoding: videoObject.waitTranscoding, state: videoObject.state, channelId: videoChannel.id, @@ -473,13 +522,13 @@ async function videoActivityObjectToDBAttributes ( } function videoFileActivityUrlToDBAttributes (video: VideoModel, videoObject: VideoTorrentObject) { - const fileUrls = videoObject.url.filter(u => isActivityVideoUrlObject(u)) as ActivityVideoUrlObject[] + const fileUrls = videoObject.url.filter(u => isAPVideoUrlObject(u)) as ActivityVideoUrlObject[] if (fileUrls.length === 0) { throw new Error('Cannot find video files for ' + video.url) } - const attributes: VideoFileModel[] = [] + const attributes: FilteredModelAttributes[] = [] for (const fileUrl of fileUrls) { // Fetch associated magnet uri const magnet = videoObject.url.find(u => { @@ -502,7 +551,45 @@ function videoFileActivityUrlToDBAttributes (video: VideoModel, videoObject: Vid size: fileUrl.size, videoId: video.id, fps: fileUrl.fps || -1 - } as VideoFileModel + } + + attributes.push(attribute) + } + + return attributes +} + +function streamingPlaylistActivityUrlToDBAttributes (video: VideoModel, videoObject: VideoTorrentObject) { + const playlistUrls = videoObject.url.filter(u => isAPStreamingPlaylistUrlObject(u)) as ActivityPlaylistUrlObject[] + if (playlistUrls.length === 0) return [] + + const attributes: FilteredModelAttributes[] = [] + for (const playlistUrlObject of playlistUrls) { + const p2pMediaLoaderInfohashes = playlistUrlObject.tag + .filter(t => t.type === 'Infohash') + .map(t => t.name) + if (p2pMediaLoaderInfohashes.length === 0) { + logger.warn('No infohashes found in AP playlist object.', { playlistUrl: playlistUrlObject }) + continue + } + + const segmentsSha256UrlObject = playlistUrlObject.tag + .find(t => { + return isAPPlaylistSegmentHashesUrlObject(t) + }) as ActivityPlaylistSegmentHashesObject + if (!segmentsSha256UrlObject) { + logger.warn('No segment sha256 URL found in AP playlist object.', { playlistUrl: playlistUrlObject }) + continue + } + + const attribute = { + type: VideoStreamingPlaylistType.HLS, + playlistUrl: playlistUrlObject.href, + segmentsSha256Url: segmentsSha256UrlObject.href, + p2pMediaLoaderInfohashes, + videoId: video.id + } + attributes.push(attribute) } diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 1875ec1fc..b2c376e20 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts @@ -1,7 +1,7 @@ import * as express from 'express' import * as Bluebird from 'bluebird' import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/models/i18n/i18n' -import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE, STATIC_PATHS } from '../initializers' +import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE } from '../initializers' import { join } from 'path' import { escapeHTML } from '../helpers/core-utils' import { VideoModel } from '../models/video/video' @@ -187,8 +187,8 @@ export class ClientHtml { // Schema.org tagsString += `` - // SEO - tagsString += `` + // SEO, use origin video url so Google does not index remote videos + tagsString += `` return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.OPENGRAPH_AND_OEMBED, tagsString) } diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts index f384a254e..672414cc0 100644 --- a/server/lib/emailer.ts +++ b/server/lib/emailer.ts @@ -296,9 +296,9 @@ class Emailer { return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload }) } - addForgetPasswordEmailJob (to: string, resetPasswordUrl: string) { + addPasswordResetEmailJob (to: string, resetPasswordUrl: string) { const text = `Hi dear user,\n\n` + - `It seems you forgot your password on ${CONFIG.WEBSERVER.HOST}! ` + + `A reset password procedure for your account ${to} has been requested on ${CONFIG.WEBSERVER.HOST} ` + `Please follow this link to reset it: ${resetPasswordUrl}\n\n` + `If you are not the person who initiated this request, please ignore this email.\n\n` + `Cheers,\n` + diff --git a/server/lib/hls.ts b/server/lib/hls.ts new file mode 100644 index 000000000..3575981f4 --- /dev/null +++ b/server/lib/hls.ts @@ -0,0 +1,164 @@ +import { VideoModel } from '../models/video/video' +import { basename, join, dirname } from 'path' +import { CONFIG, HLS_PLAYLIST_DIRECTORY } from '../initializers' +import { close, ensureDir, move, open, outputJSON, pathExists, read, readFile, remove, writeFile } from 'fs-extra' +import { getVideoFileSize } from '../helpers/ffmpeg-utils' +import { sha256 } from '../helpers/core-utils' +import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist' +import { logger } from '../helpers/logger' +import { doRequest, doRequestAndSaveToFile } from '../helpers/requests' +import { generateRandomString } from '../helpers/utils' +import { flatten, uniq } from 'lodash' + +async function updateMasterHLSPlaylist (video: VideoModel) { + const directory = join(HLS_PLAYLIST_DIRECTORY, video.uuid) + const masterPlaylists: string[] = [ '#EXTM3U', '#EXT-X-VERSION:3' ] + const masterPlaylistPath = join(directory, VideoStreamingPlaylistModel.getMasterHlsPlaylistFilename()) + + for (const file of video.VideoFiles) { + // If we did not generated a playlist for this resolution, skip + const filePlaylistPath = join(directory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(file.resolution)) + if (await pathExists(filePlaylistPath) === false) continue + + const videoFilePath = video.getVideoFilePath(file) + + const size = await getVideoFileSize(videoFilePath) + + const bandwidth = 'BANDWIDTH=' + video.getBandwidthBits(file) + const resolution = `RESOLUTION=${size.width}x${size.height}` + + let line = `#EXT-X-STREAM-INF:${bandwidth},${resolution}` + if (file.fps) line += ',FRAME-RATE=' + file.fps + + masterPlaylists.push(line) + masterPlaylists.push(VideoStreamingPlaylistModel.getHlsPlaylistFilename(file.resolution)) + } + + await writeFile(masterPlaylistPath, masterPlaylists.join('\n') + '\n') +} + +async function updateSha256Segments (video: VideoModel) { + const json: { [filename: string]: { [range: string]: string } } = {} + + const playlistDirectory = join(HLS_PLAYLIST_DIRECTORY, video.uuid) + + // For all the resolutions available for this video + for (const file of video.VideoFiles) { + const rangeHashes: { [range: string]: string } = {} + + const videoPath = join(playlistDirectory, VideoStreamingPlaylistModel.getHlsVideoName(video.uuid, file.resolution)) + const playlistPath = join(playlistDirectory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(file.resolution)) + + // Maybe the playlist is not generated for this resolution yet + if (!await pathExists(playlistPath)) continue + + const playlistContent = await readFile(playlistPath) + const ranges = getRangesFromPlaylist(playlistContent.toString()) + + const fd = await open(videoPath, 'r') + for (const range of ranges) { + const buf = Buffer.alloc(range.length) + await read(fd, buf, 0, range.length, range.offset) + + rangeHashes[`${range.offset}-${range.offset + range.length - 1}`] = sha256(buf) + } + await close(fd) + + const videoFilename = VideoStreamingPlaylistModel.getHlsVideoName(video.uuid, file.resolution) + json[videoFilename] = rangeHashes + } + + const outputPath = join(playlistDirectory, VideoStreamingPlaylistModel.getHlsSha256SegmentsFilename()) + await outputJSON(outputPath, json) +} + +function getRangesFromPlaylist (playlistContent: string) { + const ranges: { offset: number, length: number }[] = [] + const lines = playlistContent.split('\n') + const regex = /^#EXT-X-BYTERANGE:(\d+)@(\d+)$/ + + for (const line of lines) { + const captured = regex.exec(line) + + if (captured) { + ranges.push({ length: parseInt(captured[1], 10), offset: parseInt(captured[2], 10) }) + } + } + + return ranges +} + +function downloadPlaylistSegments (playlistUrl: string, destinationDir: string, timeout: number) { + let timer + + logger.info('Importing HLS playlist %s', playlistUrl) + + return new Promise(async (res, rej) => { + const tmpDirectory = join(CONFIG.STORAGE.TMP_DIR, await generateRandomString(10)) + + await ensureDir(tmpDirectory) + + timer = setTimeout(() => { + deleteTmpDirectory(tmpDirectory) + + return rej(new Error('HLS download timeout.')) + }, timeout) + + try { + // Fetch master playlist + const subPlaylistUrls = await fetchUniqUrls(playlistUrl) + + const subRequests = subPlaylistUrls.map(u => fetchUniqUrls(u)) + const fileUrls = uniq(flatten(await Promise.all(subRequests))) + + logger.debug('Will download %d HLS files.', fileUrls.length, { fileUrls }) + + for (const fileUrl of fileUrls) { + const destPath = join(tmpDirectory, basename(fileUrl)) + + await doRequestAndSaveToFile({ uri: fileUrl }, destPath) + } + + clearTimeout(timer) + + await move(tmpDirectory, destinationDir, { overwrite: true }) + + return res() + } catch (err) { + deleteTmpDirectory(tmpDirectory) + + return rej(err) + } + }) + + function deleteTmpDirectory (directory: string) { + remove(directory) + .catch(err => logger.error('Cannot delete path on HLS download error.', { err })) + } + + async function fetchUniqUrls (playlistUrl: string) { + const { body } = await doRequest({ uri: playlistUrl }) + + if (!body) return [] + + const urls = body.split('\n') + .filter(line => line.endsWith('.m3u8') || line.endsWith('.mp4')) + .map(url => { + if (url.startsWith('http://') || url.startsWith('https://')) return url + + return `${dirname(playlistUrl)}/${url}` + }) + + return uniq(urls) + } +} + +// --------------------------------------------------------------------------- + +export { + updateMasterHLSPlaylist, + updateSha256Segments, + downloadPlaylistSegments +} + +// --------------------------------------------------------------------------- diff --git a/server/lib/job-queue/handlers/activitypub-refresher.ts b/server/lib/job-queue/handlers/activitypub-refresher.ts index 671b0f487..454b975fe 100644 --- a/server/lib/job-queue/handlers/activitypub-refresher.ts +++ b/server/lib/job-queue/handlers/activitypub-refresher.ts @@ -1,30 +1,33 @@ import * as Bull from 'bull' import { logger } from '../../../helpers/logger' import { fetchVideoByUrl } from '../../../helpers/video' -import { refreshVideoIfNeeded } from '../../activitypub' +import { refreshVideoIfNeeded, refreshActorIfNeeded } from '../../activitypub' +import { ActorModel } from '../../../models/activitypub/actor' export type RefreshPayload = { - videoUrl: string - type: 'video' + type: 'video' | 'actor' + url: string } async function refreshAPObject (job: Bull.Job) { const payload = job.data as RefreshPayload - logger.info('Processing AP refresher in job %d for video %s.', job.id, payload.videoUrl) + logger.info('Processing AP refresher in job %d for %s.', job.id, payload.url) - if (payload.type === 'video') return refreshAPVideo(payload.videoUrl) + if (payload.type === 'video') return refreshVideo(payload.url) + if (payload.type === 'actor') return refreshActor(payload.url) } // --------------------------------------------------------------------------- export { + refreshActor, refreshAPObject } // --------------------------------------------------------------------------- -async function refreshAPVideo (videoUrl: string) { +async function refreshVideo (videoUrl: string) { const fetchType = 'all' as 'all' const syncParam = { likes: true, dislikes: true, shares: true, comments: true, thumbnail: true } @@ -39,3 +42,13 @@ async function refreshAPVideo (videoUrl: string) { await refreshVideoIfNeeded(refreshOptions) } } + +async function refreshActor (actorUrl: string) { + const fetchType = 'all' as 'all' + const actor = await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorUrl) + + if (actor) { + await refreshActorIfNeeded(actor, fetchType) + } + +} diff --git a/server/lib/job-queue/handlers/video-file.ts b/server/lib/job-queue/handlers/video-file.ts index 593e43cc5..04983155c 100644 --- a/server/lib/job-queue/handlers/video-file.ts +++ b/server/lib/job-queue/handlers/video-file.ts @@ -5,17 +5,18 @@ import { VideoModel } from '../../../models/video/video' import { JobQueue } from '../job-queue' import { federateVideoIfNeeded } from '../../activitypub' import { retryTransactionWrapper } from '../../../helpers/database-utils' -import { sequelizeTypescript } from '../../../initializers' +import { sequelizeTypescript, CONFIG } from '../../../initializers' import * as Bluebird from 'bluebird' import { computeResolutionsToTranscode } from '../../../helpers/ffmpeg-utils' -import { importVideoFile, optimizeVideofile, transcodeOriginalVideofile } from '../../video-transcoding' +import { generateHlsPlaylist, importVideoFile, optimizeVideofile, transcodeOriginalVideofile } from '../../video-transcoding' import { Notifier } from '../../notifier' export type VideoFilePayload = { videoUUID: string - isNewVideo?: boolean resolution?: VideoResolution + isNewVideo?: boolean isPortraitMode?: boolean + generateHlsPlaylist?: boolean } export type VideoFileImportPayload = { @@ -51,21 +52,38 @@ async function processVideoFile (job: Bull.Job) { return undefined } - // Transcoding in other resolution - if (payload.resolution) { + if (payload.generateHlsPlaylist) { + await generateHlsPlaylist(video, payload.resolution, payload.isPortraitMode || false) + + await retryTransactionWrapper(onHlsPlaylistGenerationSuccess, video) + } else if (payload.resolution) { // Transcoding in other resolution await transcodeOriginalVideofile(video, payload.resolution, payload.isPortraitMode || false) - await retryTransactionWrapper(onVideoFileTranscoderOrImportSuccess, video) + await retryTransactionWrapper(onVideoFileTranscoderOrImportSuccess, video, payload) } else { await optimizeVideofile(video) - await retryTransactionWrapper(onVideoFileOptimizerSuccess, video, payload.isNewVideo) + await retryTransactionWrapper(onVideoFileOptimizerSuccess, video, payload) } return video } -async function onVideoFileTranscoderOrImportSuccess (video: VideoModel) { +async function onHlsPlaylistGenerationSuccess (video: VideoModel) { + if (video === undefined) return undefined + + await sequelizeTypescript.transaction(async t => { + // Maybe the video changed in database, refresh it + let videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t) + // Video does not exist anymore + if (!videoDatabase) return undefined + + // If the video was not published, we consider it is a new one for other instances + await federateVideoIfNeeded(videoDatabase, false, t) + }) +} + +async function onVideoFileTranscoderOrImportSuccess (video: VideoModel, payload?: VideoFilePayload) { if (video === undefined) return undefined const { videoDatabase, videoPublished } = await sequelizeTypescript.transaction(async t => { @@ -91,13 +109,16 @@ async function onVideoFileTranscoderOrImportSuccess (video: VideoModel) { return { videoDatabase, videoPublished } }) - if (videoPublished) { + // don't notify prior to scheduled video update + if (videoPublished && !videoDatabase.ScheduleVideoUpdate) { Notifier.Instance.notifyOnNewVideo(videoDatabase) Notifier.Instance.notifyOnPendingVideoPublished(videoDatabase) } + + await createHlsJobIfEnabled(payload) } -async function onVideoFileOptimizerSuccess (videoArg: VideoModel, isNewVideo: boolean) { +async function onVideoFileOptimizerSuccess (videoArg: VideoModel, payload: VideoFilePayload) { if (videoArg === undefined) return undefined // Outside the transaction (IO on disk) @@ -144,13 +165,18 @@ async function onVideoFileOptimizerSuccess (videoArg: VideoModel, isNewVideo: bo logger.info('No transcoding jobs created for video %s (no resolutions).', videoDatabase.uuid, { privacy: videoDatabase.privacy }) } - await federateVideoIfNeeded(videoDatabase, isNewVideo, t) + await federateVideoIfNeeded(videoDatabase, payload.isNewVideo, t) return { videoDatabase, videoPublished } }) - if (isNewVideo) Notifier.Instance.notifyOnNewVideo(videoDatabase) - if (videoPublished) Notifier.Instance.notifyOnPendingVideoPublished(videoDatabase) + // don't notify prior to scheduled video update + if (!videoDatabase.ScheduleVideoUpdate) { + if (payload.isNewVideo) Notifier.Instance.notifyOnNewVideo(videoDatabase) + if (videoPublished) Notifier.Instance.notifyOnPendingVideoPublished(videoDatabase) + } + + await createHlsJobIfEnabled(Object.assign({}, payload, { resolution: videoDatabase.getOriginalFile().resolution })) } // --------------------------------------------------------------------------- @@ -159,3 +185,20 @@ export { processVideoFile, processVideoFileImport } + +// --------------------------------------------------------------------------- + +function createHlsJobIfEnabled (payload?: VideoFilePayload) { + // Generate HLS playlist? + if (payload && CONFIG.TRANSCODING.HLS.ENABLED) { + const hlsTranscodingPayload = { + videoUUID: payload.videoUUID, + resolution: payload.resolution, + isPortraitMode: payload.isPortraitMode, + + generateHlsPlaylist: true + } + + return JobQueue.Instance.createJob({ type: 'video-file', payload: hlsTranscodingPayload }) + } +} diff --git a/server/lib/schedulers/videos-redundancy-scheduler.ts b/server/lib/schedulers/videos-redundancy-scheduler.ts index f643ee226..1a48f2bd0 100644 --- a/server/lib/schedulers/videos-redundancy-scheduler.ts +++ b/server/lib/schedulers/videos-redundancy-scheduler.ts @@ -1,5 +1,5 @@ import { AbstractScheduler } from './abstract-scheduler' -import { CONFIG, REDUNDANCY, VIDEO_IMPORT_TIMEOUT } from '../../initializers' +import { CONFIG, HLS_REDUNDANCY_DIRECTORY, REDUNDANCY, VIDEO_IMPORT_TIMEOUT } from '../../initializers' import { logger } from '../../helpers/logger' import { VideosRedundancy } from '../../../shared/models/redundancy' import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy' @@ -9,9 +9,19 @@ import { join } from 'path' import { move } from 'fs-extra' import { getServerActor } from '../../helpers/utils' import { sendCreateCacheFile, sendUpdateCacheFile } from '../activitypub/send' -import { getVideoCacheFileActivityPubUrl } from '../activitypub/url' +import { getVideoCacheFileActivityPubUrl, getVideoCacheStreamingPlaylistActivityPubUrl } from '../activitypub/url' import { removeVideoRedundancy } from '../redundancy' import { getOrCreateVideoAndAccountAndChannel } from '../activitypub' +import { VideoStreamingPlaylistModel } from '../../models/video/video-streaming-playlist' +import { VideoModel } from '../../models/video/video' +import { downloadPlaylistSegments } from '../hls' + +type CandidateToDuplicate = { + redundancy: VideosRedundancy, + video: VideoModel, + files: VideoFileModel[], + streamingPlaylists: VideoStreamingPlaylistModel[] +} export class VideosRedundancyScheduler extends AbstractScheduler { @@ -24,28 +34,32 @@ export class VideosRedundancyScheduler extends AbstractScheduler { } protected async internalExecute () { - for (const obj of CONFIG.REDUNDANCY.VIDEOS.STRATEGIES) { - logger.info('Running redundancy scheduler for strategy %s.', obj.strategy) + for (const redundancyConfig of CONFIG.REDUNDANCY.VIDEOS.STRATEGIES) { + logger.info('Running redundancy scheduler for strategy %s.', redundancyConfig.strategy) try { - const videoToDuplicate = await this.findVideoToDuplicate(obj) + const videoToDuplicate = await this.findVideoToDuplicate(redundancyConfig) if (!videoToDuplicate) continue - const videoFiles = videoToDuplicate.VideoFiles - videoFiles.forEach(f => f.Video = videoToDuplicate) + const candidateToDuplicate = { + video: videoToDuplicate, + redundancy: redundancyConfig, + files: videoToDuplicate.VideoFiles, + streamingPlaylists: videoToDuplicate.VideoStreamingPlaylists + } - await this.purgeCacheIfNeeded(obj, videoFiles) + await this.purgeCacheIfNeeded(candidateToDuplicate) - if (await this.isTooHeavy(obj, videoFiles)) { + if (await this.isTooHeavy(candidateToDuplicate)) { logger.info('Video %s is too big for our cache, skipping.', videoToDuplicate.url) continue } - logger.info('Will duplicate video %s in redundancy scheduler "%s".', videoToDuplicate.url, obj.strategy) + logger.info('Will duplicate video %s in redundancy scheduler "%s".', videoToDuplicate.url, redundancyConfig.strategy) - await this.createVideoRedundancy(obj, videoFiles) + await this.createVideoRedundancies(candidateToDuplicate) } catch (err) { - logger.error('Cannot run videos redundancy %s.', obj.strategy, { err }) + logger.error('Cannot run videos redundancy %s.', redundancyConfig.strategy, { err }) } } @@ -63,25 +77,35 @@ export class VideosRedundancyScheduler extends AbstractScheduler { for (const redundancyModel of expired) { try { - await this.extendsOrDeleteRedundancy(redundancyModel) + const redundancyConfig = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES.find(s => s.strategy === redundancyModel.strategy) + const candidate = { + redundancy: redundancyConfig, + video: null, + files: [], + streamingPlaylists: [] + } + + // If the administrator disabled the redundancy or decreased the cache size, remove this redundancy instead of extending it + if (!redundancyConfig || await this.isTooHeavy(candidate)) { + logger.info('Destroying redundancy %s because the cache size %s is too heavy.', redundancyModel.url, redundancyModel.strategy) + await removeVideoRedundancy(redundancyModel) + } else { + await this.extendsRedundancy(redundancyModel) + } } catch (err) { - logger.error('Cannot extend expiration of %s video from our redundancy system.', this.buildEntryLogId(redundancyModel)) + logger.error( + 'Cannot extend or remove expiration of %s video from our redundancy system.', this.buildEntryLogId(redundancyModel), + { err } + ) } } } - private async extendsOrDeleteRedundancy (redundancyModel: VideoRedundancyModel) { - // Refresh the video, maybe it was deleted - const video = await this.loadAndRefreshVideo(redundancyModel.VideoFile.Video.url) - - if (!video) { - logger.info('Destroying existing redundancy %s, because the associated video does not exist anymore.', redundancyModel.url) - - await redundancyModel.destroy() - return - } - + private async extendsRedundancy (redundancyModel: VideoRedundancyModel) { const redundancy = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES.find(s => s.strategy === redundancyModel.strategy) + // Redundancy strategy disabled, remove our redundancy instead of extending expiration + if (!redundancy) await removeVideoRedundancy(redundancyModel) + await this.extendsExpirationOf(redundancyModel, redundancy.minLifetime) } @@ -112,49 +136,93 @@ export class VideosRedundancyScheduler extends AbstractScheduler { } } - private async createVideoRedundancy (redundancy: VideosRedundancy, filesToDuplicate: VideoFileModel[]) { - const serverActor = await getServerActor() + private async createVideoRedundancies (data: CandidateToDuplicate) { + const video = await this.loadAndRefreshVideo(data.video.url) + + if (!video) { + logger.info('Video %s we want to duplicate does not existing anymore, skipping.', data.video.url) - for (const file of filesToDuplicate) { - const video = await this.loadAndRefreshVideo(file.Video.url) + return + } + for (const file of data.files) { const existingRedundancy = await VideoRedundancyModel.loadLocalByFileId(file.id) if (existingRedundancy) { - await this.extendsOrDeleteRedundancy(existingRedundancy) + await this.extendsRedundancy(existingRedundancy) continue } - if (!video) { - logger.info('Video %s we want to duplicate does not existing anymore, skipping.', file.Video.url) + await this.createVideoFileRedundancy(data.redundancy, video, file) + } + + for (const streamingPlaylist of data.streamingPlaylists) { + const existingRedundancy = await VideoRedundancyModel.loadLocalByStreamingPlaylistId(streamingPlaylist.id) + if (existingRedundancy) { + await this.extendsRedundancy(existingRedundancy) continue } - logger.info('Duplicating %s - %d in videos redundancy with "%s" strategy.', video.url, file.resolution, redundancy.strategy) + await this.createStreamingPlaylistRedundancy(data.redundancy, video, streamingPlaylist) + } + } - const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() - const magnetUri = video.generateMagnetUri(file, baseUrlHttp, baseUrlWs) + private async createVideoFileRedundancy (redundancy: VideosRedundancy, video: VideoModel, file: VideoFileModel) { + file.Video = video - const tmpPath = await downloadWebTorrentVideo({ magnetUri }, VIDEO_IMPORT_TIMEOUT) + const serverActor = await getServerActor() - const destPath = join(CONFIG.STORAGE.REDUNDANCY_DIR, video.getVideoFilename(file)) - await move(tmpPath, destPath) + logger.info('Duplicating %s - %d in videos redundancy with "%s" strategy.', video.url, file.resolution, redundancy.strategy) - const createdModel = await VideoRedundancyModel.create({ - expiresOn: this.buildNewExpiration(redundancy.minLifetime), - url: getVideoCacheFileActivityPubUrl(file), - fileUrl: video.getVideoRedundancyUrl(file, CONFIG.WEBSERVER.URL), - strategy: redundancy.strategy, - videoFileId: file.id, - actorId: serverActor.id - }) - createdModel.VideoFile = file + const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() + const magnetUri = video.generateMagnetUri(file, baseUrlHttp, baseUrlWs) - await sendCreateCacheFile(serverActor, createdModel) + const tmpPath = await downloadWebTorrentVideo({ magnetUri }, VIDEO_IMPORT_TIMEOUT) - logger.info('Duplicated %s - %d -> %s.', video.url, file.resolution, createdModel.url) - } + const destPath = join(CONFIG.STORAGE.REDUNDANCY_DIR, video.getVideoFilename(file)) + await move(tmpPath, destPath) + + const createdModel = await VideoRedundancyModel.create({ + expiresOn: this.buildNewExpiration(redundancy.minLifetime), + url: getVideoCacheFileActivityPubUrl(file), + fileUrl: video.getVideoRedundancyUrl(file, CONFIG.WEBSERVER.URL), + strategy: redundancy.strategy, + videoFileId: file.id, + actorId: serverActor.id + }) + + createdModel.VideoFile = file + + await sendCreateCacheFile(serverActor, video, createdModel) + + logger.info('Duplicated %s - %d -> %s.', video.url, file.resolution, createdModel.url) + } + + private async createStreamingPlaylistRedundancy (redundancy: VideosRedundancy, video: VideoModel, playlist: VideoStreamingPlaylistModel) { + playlist.Video = video + + const serverActor = await getServerActor() + + logger.info('Duplicating %s streaming playlist in videos redundancy with "%s" strategy.', video.url, redundancy.strategy) + + const destDirectory = join(HLS_REDUNDANCY_DIRECTORY, video.uuid) + await downloadPlaylistSegments(playlist.playlistUrl, destDirectory, VIDEO_IMPORT_TIMEOUT) + + const createdModel = await VideoRedundancyModel.create({ + expiresOn: this.buildNewExpiration(redundancy.minLifetime), + url: getVideoCacheStreamingPlaylistActivityPubUrl(video, playlist), + fileUrl: playlist.getVideoRedundancyUrl(CONFIG.WEBSERVER.URL), + strategy: redundancy.strategy, + videoStreamingPlaylistId: playlist.id, + actorId: serverActor.id + }) + + createdModel.VideoStreamingPlaylist = playlist + + await sendCreateCacheFile(serverActor, video, createdModel) + + logger.info('Duplicated playlist %s -> %s.', playlist.playlistUrl, createdModel.url) } private async extendsExpirationOf (redundancy: VideoRedundancyModel, expiresAfterMs: number) { @@ -168,8 +236,9 @@ export class VideosRedundancyScheduler extends AbstractScheduler { await sendUpdateCacheFile(serverActor, redundancy) } - private async purgeCacheIfNeeded (redundancy: VideosRedundancy, filesToDuplicate: VideoFileModel[]) { - while (this.isTooHeavy(redundancy, filesToDuplicate)) { + private async purgeCacheIfNeeded (candidateToDuplicate: CandidateToDuplicate) { + while (this.isTooHeavy(candidateToDuplicate)) { + const redundancy = candidateToDuplicate.redundancy const toDelete = await VideoRedundancyModel.loadOldestLocalThatAlreadyExpired(redundancy.strategy, redundancy.minLifetime) if (!toDelete) return @@ -177,11 +246,11 @@ export class VideosRedundancyScheduler extends AbstractScheduler { } } - private async isTooHeavy (redundancy: VideosRedundancy, filesToDuplicate: VideoFileModel[]) { - const maxSize = redundancy.size + private async isTooHeavy (candidateToDuplicate: CandidateToDuplicate) { + const maxSize = candidateToDuplicate.redundancy.size - const totalDuplicated = await VideoRedundancyModel.getTotalDuplicated(redundancy.strategy) - const totalWillDuplicate = totalDuplicated + this.getTotalFileSizes(filesToDuplicate) + const totalDuplicated = await VideoRedundancyModel.getTotalDuplicated(candidateToDuplicate.redundancy.strategy) + const totalWillDuplicate = totalDuplicated + this.getTotalFileSizes(candidateToDuplicate.files, candidateToDuplicate.streamingPlaylists) return totalWillDuplicate > maxSize } @@ -191,13 +260,15 @@ export class VideosRedundancyScheduler extends AbstractScheduler { } private buildEntryLogId (object: VideoRedundancyModel) { - return `${object.VideoFile.Video.url}-${object.VideoFile.resolution}` + if (object.VideoFile) return `${object.VideoFile.Video.url}-${object.VideoFile.resolution}` + + return `${object.VideoStreamingPlaylist.playlistUrl}` } - private getTotalFileSizes (files: VideoFileModel[]) { + private getTotalFileSizes (files: VideoFileModel[], playlists: VideoStreamingPlaylistModel[]) { const fileReducer = (previous: number, current: VideoFileModel) => previous + current.size - return files.reduce(fileReducer, 0) + return files.reduce(fileReducer, 0) * playlists.length } private async loadAndRefreshVideo (videoUrl: string) { diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts index 4460f46e4..086b860a2 100644 --- a/server/lib/video-transcoding.ts +++ b/server/lib/video-transcoding.ts @@ -1,11 +1,14 @@ -import { CONFIG } from '../initializers' +import { CONFIG, HLS_PLAYLIST_DIRECTORY } from '../initializers' import { extname, join } from 'path' import { getVideoFileFPS, getVideoFileResolution, transcode } from '../helpers/ffmpeg-utils' -import { copy, remove, move, stat } from 'fs-extra' +import { copy, ensureDir, move, remove, stat } from 'fs-extra' import { logger } from '../helpers/logger' import { VideoResolution } from '../../shared/models/videos' import { VideoFileModel } from '../models/video/video-file' import { VideoModel } from '../models/video/video' +import { updateMasterHLSPlaylist, updateSha256Segments } from './hls' +import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist' +import { VideoStreamingPlaylistType } from '../../shared/models/videos/video-streaming-playlist.type' async function optimizeVideofile (video: VideoModel, inputVideoFileArg?: VideoFileModel) { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR @@ -17,7 +20,8 @@ async function optimizeVideofile (video: VideoModel, inputVideoFileArg?: VideoFi const transcodeOptions = { inputPath: videoInputPath, - outputPath: videoTranscodedPath + outputPath: videoTranscodedPath, + resolution: inputVideoFile.resolution } // Could be very long! @@ -47,7 +51,7 @@ async function optimizeVideofile (video: VideoModel, inputVideoFileArg?: VideoFi } } -async function transcodeOriginalVideofile (video: VideoModel, resolution: VideoResolution, isPortraitMode: boolean) { +async function transcodeOriginalVideofile (video: VideoModel, resolution: VideoResolution, isPortrait: boolean) { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR const extname = '.mp4' @@ -60,13 +64,13 @@ async function transcodeOriginalVideofile (video: VideoModel, resolution: VideoR size: 0, videoId: video.id }) - const videoOutputPath = join(videosDirectory, video.getVideoFilename(newVideoFile)) + const videoOutputPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename(newVideoFile)) const transcodeOptions = { inputPath: videoInputPath, outputPath: videoOutputPath, resolution, - isPortraitMode + isPortraitMode: isPortrait } await transcode(transcodeOptions) @@ -84,6 +88,41 @@ async function transcodeOriginalVideofile (video: VideoModel, resolution: VideoR video.VideoFiles.push(newVideoFile) } +async function generateHlsPlaylist (video: VideoModel, resolution: VideoResolution, isPortraitMode: boolean) { + const baseHlsDirectory = join(HLS_PLAYLIST_DIRECTORY, video.uuid) + await ensureDir(join(HLS_PLAYLIST_DIRECTORY, video.uuid)) + + const videoInputPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename(video.getOriginalFile())) + const outputPath = join(baseHlsDirectory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution)) + + const transcodeOptions = { + inputPath: videoInputPath, + outputPath, + resolution, + isPortraitMode, + + hlsPlaylist: { + videoFilename: VideoStreamingPlaylistModel.getHlsVideoName(video.uuid, resolution) + } + } + + await transcode(transcodeOptions) + + await updateMasterHLSPlaylist(video) + await updateSha256Segments(video) + + const playlistUrl = CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid) + + await VideoStreamingPlaylistModel.upsert({ + videoId: video.id, + playlistUrl, + segmentsSha256Url: CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid), + p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, video.VideoFiles), + + type: VideoStreamingPlaylistType.HLS + }) +} + async function importVideoFile (video: VideoModel, inputFilePath: string) { const { videoFileResolution } = await getVideoFileResolution(inputFilePath) const { size } = await stat(inputFilePath) @@ -125,6 +164,7 @@ async function importVideoFile (video: VideoModel, inputFilePath: string) { } export { + generateHlsPlaylist, optimizeVideofile, transcodeOriginalVideofile, importVideoFile diff --git a/server/middlewares/csp.ts b/server/middlewares/csp.ts index 8b919af0d..5fa9d1ab5 100644 --- a/server/middlewares/csp.ts +++ b/server/middlewares/csp.ts @@ -16,7 +16,7 @@ const baseDirectives = Object.assign({}, baseUri: ["'self'"], manifestSrc: ["'self'"], frameSrc: ["'self'"], // instead of deprecated child-src / self because of test-embed - workerSrc: ["'self'"] // instead of deprecated child-src + workerSrc: ["'self'", 'blob:'] // instead of deprecated child-src }, CONFIG.SERVICES['CSP-LOGGER'] ? { reportUri: CONFIG.SERVICES['CSP-LOGGER'] } : {}, CONFIG.WEBSERVER.SCHEME === 'https' ? { upgradeInsecureRequests: true } : {} diff --git a/server/middlewares/validators/redundancy.ts b/server/middlewares/validators/redundancy.ts index c72ab78b2..329322509 100644 --- a/server/middlewares/validators/redundancy.ts +++ b/server/middlewares/validators/redundancy.ts @@ -13,7 +13,7 @@ import { ActorFollowModel } from '../../models/activitypub/actor-follow' import { SERVER_ACTOR_NAME } from '../../initializers' import { ServerModel } from '../../models/server/server' -const videoRedundancyGetValidator = [ +const videoFileRedundancyGetValidator = [ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'), param('resolution') .customSanitizer(toIntOrNull) @@ -24,7 +24,7 @@ const videoRedundancyGetValidator = [ .custom(exists).withMessage('Should have a valid fps'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking videoRedundancyGetValidator parameters', { parameters: req.params }) + logger.debug('Checking videoFileRedundancyGetValidator parameters', { parameters: req.params }) if (areValidationErrors(req, res)) return if (!await isVideoExist(req.params.videoId, res)) return @@ -38,7 +38,31 @@ const videoRedundancyGetValidator = [ res.locals.videoFile = videoFile const videoRedundancy = await VideoRedundancyModel.loadLocalByFileId(videoFile.id) - if (!videoRedundancy)return res.status(404).json({ error: 'Video redundancy not found.' }) + if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' }) + res.locals.videoRedundancy = videoRedundancy + + return next() + } +] + +const videoPlaylistRedundancyGetValidator = [ + param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'), + param('streamingPlaylistType').custom(exists).withMessage('Should have a valid streaming playlist type'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking videoPlaylistRedundancyGetValidator parameters', { parameters: req.params }) + + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.videoId, res)) return + + const video: VideoModel = res.locals.video + const videoStreamingPlaylist = video.VideoStreamingPlaylists.find(p => p === req.params.streamingPlaylistType) + + if (!videoStreamingPlaylist) return res.status(404).json({ error: 'Video playlist not found.' }) + res.locals.videoStreamingPlaylist = videoStreamingPlaylist + + const videoRedundancy = await VideoRedundancyModel.loadLocalByStreamingPlaylistId(videoStreamingPlaylist.id) + if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' }) res.locals.videoRedundancy = videoRedundancy return next() @@ -75,6 +99,7 @@ const updateServerRedundancyValidator = [ // --------------------------------------------------------------------------- export { - videoRedundancyGetValidator, + videoFileRedundancyGetValidator, + videoPlaylistRedundancyGetValidator, updateServerRedundancyValidator } diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 1bb0bfb1b..a52e3060a 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts @@ -113,6 +113,7 @@ const deleteMeValidator = [ const usersUpdateValidator = [ param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), + body('password').optional().custom(isUserPasswordValid).withMessage('Should have a valid password'), body('email').optional().isEmail().withMessage('Should have a valid email attribute'), body('emailVerified').optional().isBoolean().withMessage('Should have a valid email verified attribute'), body('videoQuota').optional().custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'), @@ -233,6 +234,7 @@ const usersAskResetPasswordValidator = [ logger.debug('Checking usersAskResetPassword parameters', { parameters: req.body }) if (areValidationErrors(req, res)) return + const exists = await checkUserEmailExist(req.body.email, res, false) if (!exists) { logger.debug('User with email %s does not exist (asking reset password).', req.body.email) diff --git a/server/middlewares/validators/videos/video-blacklist.ts b/server/middlewares/validators/videos/video-blacklist.ts index 13da7acff..2688f63ae 100644 --- a/server/middlewares/validators/videos/video-blacklist.ts +++ b/server/middlewares/validators/videos/video-blacklist.ts @@ -1,10 +1,11 @@ import * as express from 'express' import { body, param } from 'express-validator/check' -import { isIdOrUUIDValid } from '../../../helpers/custom-validators/misc' +import { isBooleanValid, isIdOrUUIDValid } from '../../../helpers/custom-validators/misc' import { isVideoExist } from '../../../helpers/custom-validators/videos' import { logger } from '../../../helpers/logger' import { areValidationErrors } from '../utils' import { isVideoBlacklistExist, isVideoBlacklistReasonValid } from '../../../helpers/custom-validators/video-blacklist' +import { VideoModel } from '../../../models/video/video' const videosBlacklistRemoveValidator = [ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), @@ -22,6 +23,10 @@ const videosBlacklistRemoveValidator = [ const videosBlacklistAddValidator = [ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), + body('unfederate') + .optional() + .toBoolean() + .custom(isBooleanValid).withMessage('Should have a valid unfederate boolean'), body('reason') .optional() .custom(isVideoBlacklistReasonValid).withMessage('Should have a valid reason'), @@ -32,6 +37,14 @@ const videosBlacklistAddValidator = [ if (areValidationErrors(req, res)) return if (!await isVideoExist(req.params.videoId, res)) return + const video: VideoModel = res.locals.video + if (req.body.unfederate === true && video.remote === true) { + return res + .status(409) + .send({ error: 'You cannot unfederate a remote video.' }) + .end() + } + return next() } ] diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts index 194d12c6e..159727e28 100644 --- a/server/middlewares/validators/videos/videos.ts +++ b/server/middlewares/validators/videos/videos.ts @@ -341,11 +341,14 @@ function getCommonVideoAttributes () { .optional() .toBoolean() .custom(isBooleanValid).withMessage('Should have comments enabled boolean'), - body('originallyPublishedAt') + body('downloadEnabled') .optional() - .customSanitizer(toValueOrNull) - .custom(isVideoOriginallyPublishedAtValid).withMessage('Should have a valid original publication date'), - + .toBoolean() + .custom(isBooleanValid).withMessage('Should have downloading enabled boolean'), + body('originallyPublishedAt') + .optional() + .customSanitizer(toValueOrNull) + .custom(isVideoOriginallyPublishedAtValid).withMessage('Should have a valid original publication date'), body('scheduleUpdate') .optional() .customSanitizer(toValueOrNull), diff --git a/server/models/account/account.ts b/server/models/account/account.ts index a99e9b1ad..84ef0b30d 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts @@ -288,6 +288,10 @@ export class AccountModel extends Model { return this.Actor.isOwned() } + isOutdated () { + return this.Actor.isOutdated() + } + getDisplayName () { return this.name } diff --git a/server/models/account/user-notification.ts b/server/models/account/user-notification.ts index 9e4f982a3..6cdbb827b 100644 --- a/server/models/account/user-notification.ts +++ b/server/models/account/user-notification.ts @@ -27,11 +27,33 @@ import { VideoBlacklistModel } from '../video/video-blacklist' import { VideoImportModel } from '../video/video-import' import { ActorModel } from '../activitypub/actor' import { ActorFollowModel } from '../activitypub/actor-follow' +import { AvatarModel } from '../avatar/avatar' +import { ServerModel } from '../server/server' enum ScopeNames { WITH_ALL = 'WITH_ALL' } +function buildActorWithAvatarInclude () { + return { + attributes: [ 'preferredUsername' ], + model: () => ActorModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'filename' ], + model: () => AvatarModel.unscoped(), + required: false + }, + { + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), + required: false + } + ] + } +} + function buildVideoInclude (required: boolean) { return { attributes: [ 'id', 'uuid', 'name' ], @@ -40,19 +62,21 @@ function buildVideoInclude (required: boolean) { } } -function buildChannelInclude (required: boolean) { +function buildChannelInclude (required: boolean, withActor = false) { return { required, attributes: [ 'id', 'name' ], - model: () => VideoChannelModel.unscoped() + model: () => VideoChannelModel.unscoped(), + include: withActor === true ? [ buildActorWithAvatarInclude() ] : [] } } -function buildAccountInclude (required: boolean) { +function buildAccountInclude (required: boolean, withActor = false) { return { required, attributes: [ 'id', 'name' ], - model: () => AccountModel.unscoped() + model: () => AccountModel.unscoped(), + include: withActor === true ? [ buildActorWithAvatarInclude() ] : [] } } @@ -60,47 +84,40 @@ function buildAccountInclude (required: boolean) { [ScopeNames.WITH_ALL]: { include: [ Object.assign(buildVideoInclude(false), { - include: [ buildChannelInclude(true) ] + include: [ buildChannelInclude(true, true) ] }), + { attributes: [ 'id', 'originCommentId' ], model: () => VideoCommentModel.unscoped(), required: false, include: [ - buildAccountInclude(true), + buildAccountInclude(true, true), buildVideoInclude(true) ] }, + { attributes: [ 'id' ], model: () => VideoAbuseModel.unscoped(), required: false, include: [ buildVideoInclude(true) ] }, + { attributes: [ 'id' ], model: () => VideoBlacklistModel.unscoped(), required: false, include: [ buildVideoInclude(true) ] }, + { attributes: [ 'id', 'magnetUri', 'targetUrl', 'torrentName' ], model: () => VideoImportModel.unscoped(), required: false, include: [ buildVideoInclude(false) ] }, - { - attributes: [ 'id', 'name' ], - model: () => AccountModel.unscoped(), - required: false, - include: [ - { - attributes: [ 'id', 'preferredUsername' ], - model: () => ActorModel.unscoped(), - required: true - } - ] - }, + { attributes: [ 'id' ], model: () => ActorFollowModel.unscoped(), @@ -111,7 +128,23 @@ function buildAccountInclude (required: boolean) { model: () => ActorModel.unscoped(), required: true, as: 'ActorFollower', - include: [ buildAccountInclude(true) ] + include: [ + { + attributes: [ 'id', 'name' ], + model: () => AccountModel.unscoped(), + required: true + }, + { + attributes: [ 'filename' ], + model: () => AvatarModel.unscoped(), + required: false + }, + { + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), + required: false + } + ] }, { attributes: [ 'preferredUsername' ], @@ -124,7 +157,9 @@ function buildAccountInclude (required: boolean) { ] } ] - } + }, + + buildAccountInclude(false, true) ] } }) @@ -132,10 +167,63 @@ function buildAccountInclude (required: boolean) { tableName: 'userNotification', indexes: [ { - fields: [ 'videoId' ] + fields: [ 'userId' ] + }, + { + fields: [ 'videoId' ], + where: { + videoId: { + [Op.ne]: null + } + } }, { - fields: [ 'commentId' ] + fields: [ 'commentId' ], + where: { + commentId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'videoAbuseId' ], + where: { + videoAbuseId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'videoBlacklistId' ], + where: { + videoBlacklistId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'videoImportId' ], + where: { + videoImportId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'accountId' ], + where: { + accountId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'actorFollowId' ], + where: { + actorFollowId: { + [Op.ne]: null + } + } } ] }) @@ -297,12 +385,9 @@ export class UserNotificationModel extends Model { } toFormattedJSON (): UserNotification { - const video = this.Video ? Object.assign(this.formatVideo(this.Video), { - channel: { - id: this.Video.VideoChannel.id, - displayName: this.Video.VideoChannel.getDisplayName() - } - }) : undefined + const video = this.Video + ? Object.assign(this.formatVideo(this.Video),{ channel: this.formatActor(this.Video.VideoChannel) }) + : undefined const videoImport = this.VideoImport ? { id: this.VideoImport.id, @@ -315,10 +400,7 @@ export class UserNotificationModel extends Model { const comment = this.Comment ? { id: this.Comment.id, threadId: this.Comment.getThreadId(), - account: { - id: this.Comment.Account.id, - displayName: this.Comment.Account.getDisplayName() - }, + account: this.formatActor(this.Comment.Account), video: this.formatVideo(this.Comment.Video) } : undefined @@ -332,17 +414,16 @@ export class UserNotificationModel extends Model { video: this.formatVideo(this.VideoBlacklist.Video) } : undefined - const account = this.Account ? { - id: this.Account.id, - displayName: this.Account.getDisplayName(), - name: this.Account.Actor.preferredUsername - } : undefined + const account = this.Account ? this.formatActor(this.Account) : undefined const actorFollow = this.ActorFollow ? { id: this.ActorFollow.id, follower: { + id: this.ActorFollow.ActorFollower.Account.id, displayName: this.ActorFollow.ActorFollower.Account.getDisplayName(), - name: this.ActorFollow.ActorFollower.preferredUsername + name: this.ActorFollow.ActorFollower.preferredUsername, + avatar: this.ActorFollow.ActorFollower.Avatar ? { path: this.ActorFollow.ActorFollower.Avatar.getWebserverPath() } : undefined, + host: this.ActorFollow.ActorFollower.getHost() }, following: { type: this.ActorFollow.ActorFollowing.VideoChannel ? 'channel' as 'channel' : 'account' as 'account', @@ -374,4 +455,18 @@ export class UserNotificationModel extends Model { name: video.name } } + + private formatActor (accountOrChannel: AccountModel | VideoChannelModel) { + const avatar = accountOrChannel.Actor.Avatar + ? { path: accountOrChannel.Actor.Avatar.getWebserverPath() } + : undefined + + return { + id: accountOrChannel.id, + displayName: accountOrChannel.getDisplayName(), + name: accountOrChannel.Actor.preferredUsername, + host: accountOrChannel.Actor.getHost(), + avatar + } + } } diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts index 8b6cd146a..b722bed14 100644 --- a/server/models/redundancy/video-redundancy.ts +++ b/server/models/redundancy/video-redundancy.ts @@ -28,6 +28,7 @@ import { sample } from 'lodash' import { isTestInstance } from '../../helpers/core-utils' import * as Bluebird from 'bluebird' import * as Sequelize from 'sequelize' +import { VideoStreamingPlaylistModel } from '../video/video-streaming-playlist' export enum ScopeNames { WITH_VIDEO = 'WITH_VIDEO' @@ -38,7 +39,17 @@ export enum ScopeNames { include: [ { model: () => VideoFileModel, - required: true, + required: false, + include: [ + { + model: () => VideoModel, + required: true + } + ] + }, + { + model: () => VideoStreamingPlaylistModel, + required: false, include: [ { model: () => VideoModel, @@ -97,12 +108,24 @@ export class VideoRedundancyModel extends Model { @BelongsTo(() => VideoFileModel, { foreignKey: { - allowNull: false + allowNull: true }, onDelete: 'cascade' }) VideoFile: VideoFileModel + @ForeignKey(() => VideoStreamingPlaylistModel) + @Column + videoStreamingPlaylistId: number + + @BelongsTo(() => VideoStreamingPlaylistModel, { + foreignKey: { + allowNull: true + }, + onDelete: 'cascade' + }) + VideoStreamingPlaylist: VideoStreamingPlaylistModel + @ForeignKey(() => ActorModel) @Column actorId: number @@ -119,13 +142,25 @@ export class VideoRedundancyModel extends Model { static async removeFile (instance: VideoRedundancyModel) { if (!instance.isOwned()) return - const videoFile = await VideoFileModel.loadWithVideo(instance.videoFileId) + if (instance.videoFileId) { + const videoFile = await VideoFileModel.loadWithVideo(instance.videoFileId) - const logIdentifier = `${videoFile.Video.uuid}-${videoFile.resolution}` - logger.info('Removing duplicated video file %s.', logIdentifier) + const logIdentifier = `${videoFile.Video.uuid}-${videoFile.resolution}` + logger.info('Removing duplicated video file %s.', logIdentifier) - videoFile.Video.removeFile(videoFile, true) - .catch(err => logger.error('Cannot delete %s files.', logIdentifier, { err })) + videoFile.Video.removeFile(videoFile, true) + .catch(err => logger.error('Cannot delete %s files.', logIdentifier, { err })) + } + + if (instance.videoStreamingPlaylistId) { + const videoStreamingPlaylist = await VideoStreamingPlaylistModel.loadWithVideo(instance.videoStreamingPlaylistId) + + const videoUUID = videoStreamingPlaylist.Video.uuid + logger.info('Removing duplicated video streaming playlist %s.', videoUUID) + + videoStreamingPlaylist.Video.removeStreamingPlaylist(true) + .catch(err => logger.error('Cannot delete video streaming playlist files of %s.', videoUUID, { err })) + } return undefined } @@ -143,6 +178,19 @@ export class VideoRedundancyModel extends Model { return VideoRedundancyModel.scope(ScopeNames.WITH_VIDEO).findOne(query) } + static async loadLocalByStreamingPlaylistId (videoStreamingPlaylistId: number) { + const actor = await getServerActor() + + const query = { + where: { + actorId: actor.id, + videoStreamingPlaylistId + } + } + + return VideoRedundancyModel.scope(ScopeNames.WITH_VIDEO).findOne(query) + } + static loadByUrl (url: string, transaction?: Sequelize.Transaction) { const query = { where: { @@ -191,7 +239,7 @@ export class VideoRedundancyModel extends Model { const ids = rows.map(r => r.id) const id = sample(ids) - return VideoModel.loadWithFile(id, undefined, !isTestInstance()) + return VideoModel.loadWithFiles(id, undefined, !isTestInstance()) } static async findMostViewToDuplicate (randomizedFactor: number) { @@ -333,40 +381,44 @@ export class VideoRedundancyModel extends Model { static async listLocalOfServer (serverId: number) { const actor = await getServerActor() - - const query = { - where: { - actorId: actor.id - }, + const buildVideoInclude = () => ({ + model: VideoModel, + required: true, include: [ { - model: VideoFileModel, + attributes: [], + model: VideoChannelModel.unscoped(), required: true, include: [ { - model: VideoModel, + attributes: [], + model: ActorModel.unscoped(), required: true, - include: [ - { - attributes: [], - model: VideoChannelModel.unscoped(), - required: true, - include: [ - { - attributes: [], - model: ActorModel.unscoped(), - required: true, - where: { - serverId - } - } - ] - } - ] + where: { + serverId + } } ] } ] + }) + + const query = { + where: { + actorId: actor.id + }, + include: [ + { + model: VideoFileModel, + required: false, + include: [ buildVideoInclude() ] + }, + { + model: VideoStreamingPlaylistModel, + required: false, + include: [ buildVideoInclude() ] + } + ] } return VideoRedundancyModel.findAll(query) @@ -395,7 +447,7 @@ export class VideoRedundancyModel extends Model { ] } - return VideoRedundancyModel.find(query as any) // FIXME: typings + return VideoRedundancyModel.findOne(query as any) // FIXME: typings .then((r: any) => ({ totalUsed: parseInt(r.totalUsed.toString(), 10), totalVideos: r.totalVideos, @@ -403,11 +455,32 @@ export class VideoRedundancyModel extends Model { })) } + getVideo () { + if (this.VideoFile) return this.VideoFile.Video + + return this.VideoStreamingPlaylist.Video + } + isOwned () { return !!this.strategy } toActivityPubObject (): CacheFileObject { + if (this.VideoStreamingPlaylist) { + return { + id: this.url, + type: 'CacheFile' as 'CacheFile', + object: this.VideoStreamingPlaylist.Video.url, + expires: this.expiresOn.toISOString(), + url: { + type: 'Link', + mimeType: 'application/x-mpegURL', + mediaType: 'application/x-mpegURL', + href: this.fileUrl + } + } + } + return { id: this.url, type: 'CacheFile' as 'CacheFile', @@ -431,7 +504,7 @@ export class VideoRedundancyModel extends Model { const notIn = Sequelize.literal( '(' + - `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id}` + + `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id} AND "videoFileId" IS NOT NULL` + ')' ) diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index 4c9e2d05e..cc47644f2 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -1,17 +1,4 @@ -import { - AfterCreate, - AllowNull, - BelongsTo, - Column, - CreatedAt, - DataType, - Default, - ForeignKey, - Is, - Model, - Table, - UpdatedAt -} from 'sequelize-typescript' +import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' import { VideoAbuseObject } from '../../../shared/models/activitypub/objects' import { VideoAbuse } from '../../../shared/models/videos' import { @@ -19,7 +6,6 @@ import { isVideoAbuseReasonValid, isVideoAbuseStateValid } from '../../helpers/custom-validators/video-abuses' -import { Emailer } from '../../lib/emailer' import { AccountModel } from '../account/account' import { getSort, throwIfNotValid } from '../utils' import { VideoModel } from './video' @@ -40,8 +26,9 @@ import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers' export class VideoAbuseModel extends Model { @AllowNull(false) + @Default(null) @Is('VideoAbuseReason', value => throwIfNotValid(value, isVideoAbuseReasonValid, 'reason')) - @Column + @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_ABUSES.REASON.max)) reason: string @AllowNull(false) diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts index 23e992685..3b567e488 100644 --- a/server/models/video/video-blacklist.ts +++ b/server/models/video/video-blacklist.ts @@ -1,21 +1,7 @@ -import { - AfterCreate, - AfterDestroy, - AllowNull, - BelongsTo, - Column, - CreatedAt, - DataType, - ForeignKey, - Is, - Model, - Table, - UpdatedAt -} from 'sequelize-typescript' +import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' import { getSortOnModel, SortType, throwIfNotValid } from '../utils' import { VideoModel } from './video' import { isVideoBlacklistReasonValid } from '../../helpers/custom-validators/video-blacklist' -import { Emailer } from '../../lib/emailer' import { VideoBlacklist } from '../../../shared/models/videos' import { CONSTRAINTS_FIELDS } from '../../initializers' @@ -35,6 +21,10 @@ export class VideoBlacklistModel extends Model { @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_BLACKLIST.REASON.max)) reason: string + @AllowNull(false) + @Column + unfederated: boolean + @CreatedAt createdAt: Date @@ -93,6 +83,7 @@ export class VideoBlacklistModel extends Model { createdAt: this.createdAt, updatedAt: this.updatedAt, reason: this.reason, + unfederated: this.unfederated, video: { id: video.id, diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 86bf0461a..5598d80f6 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts @@ -470,4 +470,8 @@ export class VideoChannelModel extends Model { getDisplayName () { return this.name } + + isOutdated () { + return this.Actor.isOutdated() + } } diff --git a/server/models/video/video-file.ts b/server/models/video/video-file.ts index 0fd868cd6..7d1e371b9 100644 --- a/server/models/video/video-file.ts +++ b/server/models/video/video-file.ts @@ -62,7 +62,7 @@ export class VideoFileModel extends Model { extname: string @AllowNull(false) - @Is('VideoFileSize', value => throwIfNotValid(value, isVideoFileInfoHashValid, 'info hash')) + @Is('VideoFileInfohash', value => throwIfNotValid(value, isVideoFileInfoHashValid, 'info hash')) @Column infoHash: string @@ -86,14 +86,14 @@ export class VideoFileModel extends Model { @HasMany(() => VideoRedundancyModel, { foreignKey: { - allowNull: false + allowNull: true }, onDelete: 'CASCADE', hooks: true }) RedundancyVideos: VideoRedundancyModel[] - static isInfohashExists (infoHash: string) { + static doesInfohashExist (infoHash: string) { const query = 'SELECT 1 FROM "videoFile" WHERE "infoHash" = $infoHash LIMIT 1' const options = { type: Sequelize.QueryTypes.SELECT, @@ -120,6 +120,26 @@ export class VideoFileModel extends Model { return VideoFileModel.findById(id, options) } + static async getStats () { + let totalLocalVideoFilesSize = await VideoFileModel.sum('size', { + include: [ + { + attributes: [], + model: VideoModel.unscoped(), + where: { + remote: false + } + } + ] + } as any) + // Sequelize could return null... + if (!totalLocalVideoFilesSize) totalLocalVideoFilesSize = 0 + + return { + totalLocalVideoFilesSize + } + } + hasSameUniqueKeysThan (other: VideoFileModel) { return this.fps === other.fps && this.resolution === other.resolution && diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts index 7a9513cbe..c63285e25 100644 --- a/server/models/video/video-format-utils.ts +++ b/server/models/video/video-format-utils.ts @@ -1,7 +1,12 @@ import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' import { VideoModel } from './video' import { VideoFileModel } from './video-file' -import { ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects' +import { + ActivityPlaylistInfohashesObject, + ActivityPlaylistSegmentHashesObject, + ActivityUrlObject, + VideoTorrentObject +} from '../../../shared/models/activitypub/objects' import { CONFIG, MIMETYPES, THUMBNAILS_SIZE } from '../../initializers' import { VideoCaptionModel } from './video-caption' import { @@ -11,6 +16,8 @@ import { getVideoSharesActivityPubUrl } from '../../lib/activitypub' import { isArray } from '../../helpers/custom-validators/misc' +import { VideoStreamingPlaylist } from '../../../shared/models/videos/video-streaming-playlist.model' +import { VideoStreamingPlaylistModel } from './video-streaming-playlist' export type VideoFormattingJSONOptions = { completeDescription?: boolean @@ -121,7 +128,12 @@ function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { } }) + const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() + const tags = video.Tags ? video.Tags.map(t => t.name) : [] + + const streamingPlaylists = streamingPlaylistsModelToFormattedJSON(video, video.VideoStreamingPlaylists) + const detailsJson = { support: video.support, descriptionPath: video.getDescriptionAPIPath(), @@ -129,12 +141,17 @@ function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { account: video.VideoChannel.Account.toFormattedJSON(), tags, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, waitTranscoding: video.waitTranscoding, state: { id: video.state, label: VideoModel.getStateLabel(video.state) }, - files: [] + + trackerUrls: video.getTrackerUrls(baseUrlHttp, baseUrlWs), + + files: [], + streamingPlaylists } // Format and sort video files @@ -143,6 +160,25 @@ function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { return Object.assign(formattedJson, detailsJson) } +function streamingPlaylistsModelToFormattedJSON (video: VideoModel, playlists: VideoStreamingPlaylistModel[]): VideoStreamingPlaylist[] { + if (isArray(playlists) === false) return [] + + return playlists + .map(playlist => { + const redundancies = isArray(playlist.RedundancyVideos) + ? playlist.RedundancyVideos.map(r => ({ baseUrl: r.fileUrl })) + : [] + + return { + id: playlist.id, + type: playlist.type, + playlistUrl: playlist.playlistUrl, + segmentsSha256Url: playlist.segmentsSha256Url, + redundancies + } as VideoStreamingPlaylist + }) +} + function videoFilesModelToFormattedJSON (video: VideoModel, videoFiles: VideoFileModel[]): VideoFile[] { const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() @@ -233,6 +269,28 @@ function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { }) } + for (const playlist of (video.VideoStreamingPlaylists || [])) { + let tag: (ActivityPlaylistSegmentHashesObject | ActivityPlaylistInfohashesObject)[] + + tag = playlist.p2pMediaLoaderInfohashes + .map(i => ({ type: 'Infohash' as 'Infohash', name: i })) + tag.push({ + type: 'Link', + name: 'sha256', + mimeType: 'application/json' as 'application/json', + mediaType: 'application/json' as 'application/json', + href: playlist.segmentsSha256Url + }) + + url.push({ + type: 'Link', + mimeType: 'application/x-mpegURL' as 'application/x-mpegURL', + mediaType: 'application/x-mpegURL' as 'application/x-mpegURL', + href: playlist.playlistUrl, + tag + }) + } + // Add video url too url.push({ type: 'Link', @@ -264,6 +322,7 @@ function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { waitTranscoding: video.waitTranscoding, state: video.state, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, published: video.publishedAt.toISOString(), originallyPublishedAt: video.originallyPublishedAt ? video.originallyPublishedAt.toISOString() : diff --git a/server/models/video/video-streaming-playlist.ts b/server/models/video/video-streaming-playlist.ts new file mode 100644 index 000000000..bf6f7b0c4 --- /dev/null +++ b/server/models/video/video-streaming-playlist.ts @@ -0,0 +1,158 @@ +import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, HasMany, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' +import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' +import { throwIfNotValid } from '../utils' +import { VideoModel } from './video' +import * as Sequelize from 'sequelize' +import { VideoRedundancyModel } from '../redundancy/video-redundancy' +import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' +import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' +import { CONSTRAINTS_FIELDS, STATIC_PATHS } from '../../initializers' +import { VideoFileModel } from './video-file' +import { join } from 'path' +import { sha1 } from '../../helpers/core-utils' +import { isArrayOf } from '../../helpers/custom-validators/misc' + +@Table({ + tableName: 'videoStreamingPlaylist', + indexes: [ + { + fields: [ 'videoId' ] + }, + { + fields: [ 'videoId', 'type' ], + unique: true + }, + { + fields: [ 'p2pMediaLoaderInfohashes' ], + using: 'gin' + } + ] +}) +export class VideoStreamingPlaylistModel extends Model { + @CreatedAt + createdAt: Date + + @UpdatedAt + updatedAt: Date + + @AllowNull(false) + @Column + type: VideoStreamingPlaylistType + + @AllowNull(false) + @Is('PlaylistUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'playlist url')) + @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max)) + playlistUrl: string + + @AllowNull(false) + @Is('VideoStreamingPlaylistInfoHashes', value => throwIfNotValid(value, v => isArrayOf(v, isVideoFileInfoHashValid), 'info hashes')) + @Column(DataType.ARRAY(DataType.STRING)) + p2pMediaLoaderInfohashes: string[] + + @AllowNull(false) + @Is('VideoStreamingSegmentsSha256Url', value => throwIfNotValid(value, isActivityPubUrlValid, 'segments sha256 url')) + @Column + segmentsSha256Url: string + + @ForeignKey(() => VideoModel) + @Column + videoId: number + + @BelongsTo(() => VideoModel, { + foreignKey: { + allowNull: false + }, + onDelete: 'CASCADE' + }) + Video: VideoModel + + @HasMany(() => VideoRedundancyModel, { + foreignKey: { + allowNull: false + }, + onDelete: 'CASCADE', + hooks: true + }) + RedundancyVideos: VideoRedundancyModel[] + + static doesInfohashExist (infoHash: string) { + const query = 'SELECT 1 FROM "videoStreamingPlaylist" WHERE $infoHash = ANY("p2pMediaLoaderInfohashes") LIMIT 1' + const options = { + type: Sequelize.QueryTypes.SELECT, + bind: { infoHash }, + raw: true + } + + return VideoModel.sequelize.query(query, options) + .then(results => { + return results.length === 1 + }) + } + + static buildP2PMediaLoaderInfoHashes (playlistUrl: string, videoFiles: VideoFileModel[]) { + const hashes: string[] = [] + + // https://github.com/Novage/p2p-media-loader/blob/master/p2p-media-loader-core/lib/p2p-media-manager.ts#L97 + for (let i = 0; i < videoFiles.length; i++) { + hashes.push(sha1(`1${playlistUrl}+V${i}`)) + } + + return hashes + } + + static loadWithVideo (id: number) { + const options = { + include: [ + { + model: VideoModel.unscoped(), + required: true + } + ] + } + + return VideoStreamingPlaylistModel.findById(id, options) + } + + static getHlsPlaylistFilename (resolution: number) { + return resolution + '.m3u8' + } + + static getMasterHlsPlaylistFilename () { + return 'master.m3u8' + } + + static getHlsSha256SegmentsFilename () { + return 'segments-sha256.json' + } + + static getHlsVideoName (uuid: string, resolution: number) { + return `${uuid}-${resolution}-fragmented.mp4` + } + + static getHlsMasterPlaylistStaticPath (videoUUID: string) { + return join(STATIC_PATHS.PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getMasterHlsPlaylistFilename()) + } + + static getHlsPlaylistStaticPath (videoUUID: string, resolution: number) { + return join(STATIC_PATHS.PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution)) + } + + static getHlsSha256SegmentsStaticPath (videoUUID: string) { + return join(STATIC_PATHS.PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsSha256SegmentsFilename()) + } + + getStringType () { + if (this.type === VideoStreamingPlaylistType.HLS) return 'hls' + + return 'unknown' + } + + getVideoRedundancyUrl (baseUrlHttp: string) { + return baseUrlHttp + STATIC_PATHS.REDUNDANCY + this.getStringType() + '/' + this.Video.uuid + } + + hasSameUniqueKeysThan (other: VideoStreamingPlaylistModel) { + return this.type === other.type && + this.videoId === other.videoId + } +} diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 806b6e046..73626b6a0 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -52,7 +52,7 @@ import { ACTIVITY_PUB, API_VERSION, CONFIG, - CONSTRAINTS_FIELDS, + CONSTRAINTS_FIELDS, HLS_PLAYLIST_DIRECTORY, HLS_REDUNDANCY_DIRECTORY, PREVIEWS_SIZE, REMOTE_SCHEME, STATIC_DOWNLOAD_PATHS, @@ -95,6 +95,7 @@ import * as validator from 'validator' import { UserVideoHistoryModel } from '../account/user-video-history' import { UserModel } from '../account/user' import { VideoImportModel } from './video-import' +import { VideoStreamingPlaylistModel } from './video-streaming-playlist' // FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation const indexes: Sequelize.DefineIndexesOptions[] = [ @@ -160,7 +161,9 @@ export enum ScopeNames { WITH_FILES = 'WITH_FILES', WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE', WITH_BLACKLISTED = 'WITH_BLACKLISTED', - WITH_USER_HISTORY = 'WITH_USER_HISTORY' + WITH_USER_HISTORY = 'WITH_USER_HISTORY', + WITH_STREAMING_PLAYLISTS = 'WITH_STREAMING_PLAYLISTS', + WITH_USER_ID = 'WITH_USER_ID' } type ForAPIOptions = { @@ -464,6 +467,22 @@ type AvailableForListIDsOptions = { return query }, + [ ScopeNames.WITH_USER_ID ]: { + include: [ + { + attributes: [ 'accountId' ], + model: () => VideoChannelModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'userId' ], + model: () => AccountModel.unscoped(), + required: true + } + ] + } + ] + }, [ ScopeNames.WITH_ACCOUNT_DETAILS ]: { include: [ { @@ -528,22 +547,55 @@ type AvailableForListIDsOptions = { } ] }, - [ ScopeNames.WITH_FILES ]: { - include: [ - { - model: () => VideoFileModel.unscoped(), - // FIXME: typings - [ 'separate' as any ]: true, // We may have multiple files, having multiple redundancies so let's separate this join - required: false, - include: [ - { - attributes: [ 'fileUrl' ], - model: () => VideoRedundancyModel.unscoped(), - required: false - } - ] - } - ] + [ ScopeNames.WITH_FILES ]: (withRedundancies = false) => { + let subInclude: any[] = [] + + if (withRedundancies === true) { + subInclude = [ + { + attributes: [ 'fileUrl' ], + model: VideoRedundancyModel.unscoped(), + required: false + } + ] + } + + return { + include: [ + { + model: VideoFileModel.unscoped(), + // FIXME: typings + [ 'separate' as any ]: true, // We may have multiple files, having multiple redundancies so let's separate this join + required: false, + include: subInclude + } + ] + } + }, + [ ScopeNames.WITH_STREAMING_PLAYLISTS ]: (withRedundancies = false) => { + let subInclude: any[] = [] + + if (withRedundancies === true) { + subInclude = [ + { + attributes: [ 'fileUrl' ], + model: VideoRedundancyModel.unscoped(), + required: false + } + ] + } + + return { + include: [ + { + model: VideoStreamingPlaylistModel.unscoped(), + // FIXME: typings + [ 'separate' as any ]: true, // We may have multiple streaming playlists, having multiple redundancies so let's separate this join + required: false, + include: subInclude + } + ] + } }, [ ScopeNames.WITH_SCHEDULED_UPDATE ]: { include: [ @@ -664,6 +716,10 @@ export class VideoModel extends Model { @Column commentsEnabled: boolean + @AllowNull(false) + @Column + downloadEnabled: boolean + @AllowNull(false) @Column waitTranscoding: boolean @@ -726,6 +782,16 @@ export class VideoModel extends Model { }) VideoFiles: VideoFileModel[] + @HasMany(() => VideoStreamingPlaylistModel, { + foreignKey: { + name: 'videoId', + allowNull: false + }, + hooks: true, + onDelete: 'cascade' + }) + VideoStreamingPlaylists: VideoStreamingPlaylistModel[] + @HasMany(() => VideoShareModel, { foreignKey: { name: 'videoId', @@ -851,6 +917,9 @@ export class VideoModel extends Model { tasks.push(instance.removeFile(file)) tasks.push(instance.removeTorrent(file)) }) + + // Remove playlists file + tasks.push(instance.removeStreamingPlaylist()) } // Do not wait video deletion because we could be in a transaction @@ -862,10 +931,6 @@ export class VideoModel extends Model { return undefined } - static list () { - return VideoModel.scope(ScopeNames.WITH_FILES).findAll() - } - static listLocal () { const query = { where: { @@ -873,7 +938,7 @@ export class VideoModel extends Model { } } - return VideoModel.scope(ScopeNames.WITH_FILES).findAll(query) + return VideoModel.scope([ ScopeNames.WITH_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS ]).findAll(query) } static listAllAndSharedByActorForOutbox (actorId: number, start: number, count: number) { @@ -1204,6 +1269,16 @@ export class VideoModel extends Model { return VideoModel.findOne(options) } + static loadWithRights (id: number | string, t?: Sequelize.Transaction) { + const where = VideoModel.buildWhereIdOrUUID(id) + const options = { + where, + transaction: t + } + + return VideoModel.scope([ ScopeNames.WITH_BLACKLISTED, ScopeNames.WITH_USER_ID ]).findOne(options) + } + static loadOnlyId (id: number | string, t?: Sequelize.Transaction) { const where = VideoModel.buildWhereIdOrUUID(id) @@ -1216,8 +1291,8 @@ export class VideoModel extends Model { return VideoModel.findOne(options) } - static loadWithFile (id: number, t?: Sequelize.Transaction, logging?: boolean) { - return VideoModel.scope(ScopeNames.WITH_FILES) + static loadWithFiles (id: number, t?: Sequelize.Transaction, logging?: boolean) { + return VideoModel.scope([ ScopeNames.WITH_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS ]) .findById(id, { transaction: t, logging }) } @@ -1228,9 +1303,7 @@ export class VideoModel extends Model { } } - return VideoModel - .scope([ ScopeNames.WITH_FILES ]) - .findOne(options) + return VideoModel.findOne(options) } static loadByUrl (url: string, transaction?: Sequelize.Transaction) { @@ -1252,7 +1325,11 @@ export class VideoModel extends Model { transaction } - return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_FILES ]).findOne(query) + return VideoModel.scope([ + ScopeNames.WITH_ACCOUNT_DETAILS, + ScopeNames.WITH_FILES, + ScopeNames.WITH_STREAMING_PLAYLISTS + ]).findOne(query) } static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Sequelize.Transaction, userId?: number) { @@ -1267,9 +1344,37 @@ export class VideoModel extends Model { const scopes = [ ScopeNames.WITH_TAGS, ScopeNames.WITH_BLACKLISTED, + ScopeNames.WITH_ACCOUNT_DETAILS, + ScopeNames.WITH_SCHEDULED_UPDATE, ScopeNames.WITH_FILES, + ScopeNames.WITH_STREAMING_PLAYLISTS + ] + + if (userId) { + scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] } as any) // FIXME: typings + } + + return VideoModel + .scope(scopes) + .findOne(options) + } + + static loadForGetAPI (id: number | string, t?: Sequelize.Transaction, userId?: number) { + const where = VideoModel.buildWhereIdOrUUID(id) + + const options = { + order: [ [ 'Tags', 'name', 'ASC' ] ], + where, + transaction: t + } + + const scopes = [ + ScopeNames.WITH_TAGS, + ScopeNames.WITH_BLACKLISTED, ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_SCHEDULED_UPDATE + ScopeNames.WITH_SCHEDULED_UPDATE, + { method: [ ScopeNames.WITH_FILES, true ] } as any, // FIXME: typings + { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] } as any // FIXME: typings ] if (userId) { @@ -1616,6 +1721,14 @@ export class VideoModel extends Model { .catch(err => logger.warn('Cannot delete torrent %s.', torrentPath, { err })) } + removeStreamingPlaylist (isRedundancy = false) { + const baseDir = isRedundancy ? HLS_REDUNDANCY_DIRECTORY : HLS_PLAYLIST_DIRECTORY + + const filePath = join(baseDir, this.uuid) + return remove(filePath) + .catch(err => logger.warn('Cannot delete playlist directory %s.', filePath, { err })) + } + isOutdated () { if (this.isOwned()) return false @@ -1650,7 +1763,7 @@ export class VideoModel extends Model { generateMagnetUri (videoFile: VideoFileModel, baseUrlHttp: string, baseUrlWs: string) { const xs = this.getTorrentUrl(videoFile, baseUrlHttp) - const announce = [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ] + const announce = this.getTrackerUrls(baseUrlHttp, baseUrlWs) let urlList = [ this.getVideoFileUrl(videoFile, baseUrlHttp) ] const redundancies = videoFile.RedundancyVideos @@ -1667,6 +1780,10 @@ export class VideoModel extends Model { return magnetUtil.encode(magnetHash) } + getTrackerUrls (baseUrlHttp: string, baseUrlWs: string) { + return [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ] + } + getThumbnailUrl (baseUrlHttp: string) { return baseUrlHttp + STATIC_PATHS.THUMBNAILS + this.getThumbnailName() } @@ -1690,4 +1807,8 @@ export class VideoModel extends Model { getVideoFileDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + this.getVideoFilename(videoFile) } + + getBandwidthBits (videoFile: VideoFileModel) { + return Math.ceil((videoFile.size * 8) / this.duration) + } } diff --git a/server/tests/api/check-params/accounts.ts b/server/tests/api/check-params/accounts.ts index 567fd072c..68f9519c6 100644 --- a/server/tests/api/check-params/accounts.ts +++ b/server/tests/api/check-params/accounts.ts @@ -10,7 +10,7 @@ import { } from '../../../../shared/utils/requests/check-api-params' import { getAccount } from '../../../../shared/utils/users/accounts' -describe('Test users API validators', function () { +describe('Test accounts API validators', function () { const path = '/api/v1/accounts/' let server: ServerInfo diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts index 4038ecbf0..07de2b5a5 100644 --- a/server/tests/api/check-params/config.ts +++ b/server/tests/api/check-params/config.ts @@ -65,6 +65,9 @@ describe('Test config API validators', function () { '480p': true, '720p': false, '1080p': false + }, + hls: { + enabled: false } }, import: { diff --git a/server/tests/api/check-params/contact-form.ts b/server/tests/api/check-params/contact-form.ts index 2407ac0b5..c7e014b1f 100644 --- a/server/tests/api/check-params/contact-form.ts +++ b/server/tests/api/check-params/contact-form.ts @@ -46,6 +46,8 @@ describe('Test contact form API validators', function () { }) it('Should not accept a contact form if it is disabled in the configuration', async function () { + this.timeout(10000) + killallServers([ server ]) // Contact form is disabled @@ -54,6 +56,8 @@ describe('Test contact form API validators', function () { }) it('Should not accept a contact form if from email is invalid', async function () { + this.timeout(10000) + killallServers([ server ]) // Email & contact form enabled diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index a3e8e2e9c..13be8b460 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts @@ -464,6 +464,24 @@ describe('Test users API validators', function () { await makePutBodyRequest({ url: server.url, path: path + userId, token: server.accessToken, fields }) }) + it('Should fail with a too small password', async function () { + const fields = { + currentPassword: 'my super password', + password: 'bla' + } + + await makePutBodyRequest({ url: server.url, path: path + userId, token: server.accessToken, fields }) + }) + + it('Should fail with a too long password', async function () { + const fields = { + currentPassword: 'my super password', + password: 'super'.repeat(61) + } + + await makePutBodyRequest({ url: server.url, path: path + userId, token: server.accessToken, fields }) + }) + it('Should fail with an non authenticated user', async function () { const fields = { videoQuota: 42 diff --git a/server/tests/api/check-params/video-abuses.ts b/server/tests/api/check-params/video-abuses.ts index a79ab4201..3b8f5f14d 100644 --- a/server/tests/api/check-params/video-abuses.ts +++ b/server/tests/api/check-params/video-abuses.ts @@ -113,8 +113,8 @@ describe('Test video abuses API validators', function () { await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) - it('Should fail with a reason too big', async function () { - const fields = { reason: 'super'.repeat(61) } + it('Should fail with a too big reason', async function () { + const fields = { reason: 'super'.repeat(605) } await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) @@ -154,7 +154,7 @@ describe('Test video abuses API validators', function () { }) it('Should fail with a bad moderation comment', async function () { - const body = { moderationComment: 'b'.repeat(305) } + const body = { moderationComment: 'b'.repeat(3001) } await updateVideoAbuse(server.url, server.accessToken, server.video.uuid, videoAbuseId, body, 400) }) diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts index 8e1206db3..6b82643f4 100644 --- a/server/tests/api/check-params/video-blacklist.ts +++ b/server/tests/api/check-params/video-blacklist.ts @@ -4,17 +4,20 @@ import 'mocha' import { createUser, + doubleFollow, + flushAndRunMultipleServers, flushTests, - getBlacklistedVideosList, getVideo, getVideoWithToken, + getBlacklistedVideosList, + getVideo, + getVideoWithToken, killallServers, makePostBodyRequest, makePutBodyRequest, removeVideoFromBlacklist, - runServer, ServerInfo, setAccessTokensToServers, uploadVideo, - userLogin + userLogin, waitJobs } from '../../../../shared/utils' import { checkBadCountPagination, @@ -25,8 +28,9 @@ import { VideoDetails } from '../../../../shared/models/videos' import { expect } from 'chai' describe('Test video blacklist API validators', function () { - let server: ServerInfo + let servers: ServerInfo[] let notBlacklistedVideoId: number + let remoteVideoUUID: string let userAccessToken1 = '' let userAccessToken2 = '' @@ -36,75 +40,89 @@ describe('Test video blacklist API validators', function () { this.timeout(120000) await flushTests() + servers = await flushAndRunMultipleServers(2) - server = await runServer(1) - - await setAccessTokensToServers([ server ]) + await setAccessTokensToServers(servers) + await doubleFollow(servers[0], servers[1]) { const username = 'user1' const password = 'my super password' - await createUser(server.url, server.accessToken, username, password) - userAccessToken1 = await userLogin(server, { username, password }) + await createUser(servers[0].url, servers[0].accessToken, username, password) + userAccessToken1 = await userLogin(servers[0], { username, password }) } { const username = 'user2' const password = 'my super password' - await createUser(server.url, server.accessToken, username, password) - userAccessToken2 = await userLogin(server, { username, password }) + await createUser(servers[0].url, servers[0].accessToken, username, password) + userAccessToken2 = await userLogin(servers[0], { username, password }) } { - const res = await uploadVideo(server.url, userAccessToken1, {}) - server.video = res.body.video + const res = await uploadVideo(servers[0].url, userAccessToken1, {}) + servers[0].video = res.body.video } { - const res = await uploadVideo(server.url, server.accessToken, {}) + const res = await uploadVideo(servers[0].url, servers[0].accessToken, {}) notBlacklistedVideoId = res.body.video.uuid } + + { + const res = await uploadVideo(servers[1].url, servers[1].accessToken, {}) + remoteVideoUUID = res.body.video.uuid + } + + await waitJobs(servers) }) describe('When adding a video in blacklist', function () { const basePath = '/api/v1/videos/' it('Should fail with nothing', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields }) }) it('Should fail with a wrong video', async function () { const wrongPath = '/api/v1/videos/blabla/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path: wrongPath, token: server.accessToken, fields }) + await makePostBodyRequest({ url: servers[0].url, path: wrongPath, token: servers[0].accessToken, fields }) }) it('Should fail with a non authenticated user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path, token: 'hello', fields, statusCodeExpected: 401 }) + await makePostBodyRequest({ url: servers[0].url, path, token: 'hello', fields, statusCodeExpected: 401 }) }) it('Should fail with a non admin user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) + await makePostBodyRequest({ url: servers[0].url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) }) it('Should fail with an invalid reason', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { reason: 'a'.repeat(305) } - await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields }) + }) + + it('Should fail to unfederate a remote video', async function () { + const path = basePath + remoteVideoUUID + '/blacklist' + const fields = { unfederate: true } + + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 409 }) }) it('Should succeed with the correct params', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { } - await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 204 }) + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 204 }) }) }) @@ -114,61 +132,61 @@ describe('Test video blacklist API validators', function () { it('Should fail with a wrong video', async function () { const wrongPath = '/api/v1/videos/blabla/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path: wrongPath, token: server.accessToken, fields }) + await makePutBodyRequest({ url: servers[0].url, path: wrongPath, token: servers[0].accessToken, fields }) }) it('Should fail with a video not blacklisted', async function () { const path = '/api/v1/videos/' + notBlacklistedVideoId + '/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 404 }) + await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 404 }) }) it('Should fail with a non authenticated user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path, token: 'hello', fields, statusCodeExpected: 401 }) + await makePutBodyRequest({ url: servers[0].url, path, token: 'hello', fields, statusCodeExpected: 401 }) }) it('Should fail with a non admin user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) + await makePutBodyRequest({ url: servers[0].url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) }) it('Should fail with an invalid reason', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { reason: 'a'.repeat(305) } - await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields }) }) it('Should succeed with the correct params', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { reason: 'hello' } - await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 204 }) + await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 204 }) }) }) describe('When getting blacklisted video', function () { it('Should fail with a non authenticated user', async function () { - await getVideo(server.url, server.video.uuid, 401) + await getVideo(servers[0].url, servers[0].video.uuid, 401) }) it('Should fail with another user', async function () { - await getVideoWithToken(server.url, userAccessToken2, server.video.uuid, 403) + await getVideoWithToken(servers[0].url, userAccessToken2, servers[0].video.uuid, 403) }) it('Should succeed with the owner authenticated user', async function () { - const res = await getVideoWithToken(server.url, userAccessToken1, server.video.uuid, 200) + const res = await getVideoWithToken(servers[0].url, userAccessToken1, servers[0].video.uuid, 200) const video: VideoDetails = res.body expect(video.blacklisted).to.be.true }) it('Should succeed with an admin', async function () { - const res = await getVideoWithToken(server.url, server.accessToken, server.video.uuid, 200) + const res = await getVideoWithToken(servers[0].url, servers[0].accessToken, servers[0].video.uuid, 200) const video: VideoDetails = res.body expect(video.blacklisted).to.be.true @@ -177,24 +195,24 @@ describe('Test video blacklist API validators', function () { describe('When removing a video in blacklist', function () { it('Should fail with a non authenticated user', async function () { - await removeVideoFromBlacklist(server.url, 'fake token', server.video.uuid, 401) + await removeVideoFromBlacklist(servers[0].url, 'fake token', servers[0].video.uuid, 401) }) it('Should fail with a non admin user', async function () { - await removeVideoFromBlacklist(server.url, userAccessToken2, server.video.uuid, 403) + await removeVideoFromBlacklist(servers[0].url, userAccessToken2, servers[0].video.uuid, 403) }) it('Should fail with an incorrect id', async function () { - await removeVideoFromBlacklist(server.url, server.accessToken, 'hello', 400) + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, 'hello', 400) }) it('Should fail with a not blacklisted video', async function () { // The video was not added to the blacklist so it should fail - await removeVideoFromBlacklist(server.url, server.accessToken, notBlacklistedVideoId, 404) + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, notBlacklistedVideoId, 404) }) it('Should succeed with the correct params', async function () { - await removeVideoFromBlacklist(server.url, server.accessToken, server.video.uuid, 204) + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, servers[0].video.uuid, 204) }) }) @@ -202,28 +220,28 @@ describe('Test video blacklist API validators', function () { const basePath = '/api/v1/videos/blacklist/' it('Should fail with a non authenticated user', async function () { - await getBlacklistedVideosList(server.url, 'fake token', 401) + await getBlacklistedVideosList(servers[0].url, 'fake token', 401) }) it('Should fail with a non admin user', async function () { - await getBlacklistedVideosList(server.url, userAccessToken2, 403) + await getBlacklistedVideosList(servers[0].url, userAccessToken2, 403) }) it('Should fail with a bad start pagination', async function () { - await checkBadStartPagination(server.url, basePath, server.accessToken) + await checkBadStartPagination(servers[0].url, basePath, servers[0].accessToken) }) it('Should fail with a bad count pagination', async function () { - await checkBadCountPagination(server.url, basePath, server.accessToken) + await checkBadCountPagination(servers[0].url, basePath, servers[0].accessToken) }) it('Should fail with an incorrect sort', async function () { - await checkBadSortPagination(server.url, basePath, server.accessToken) + await checkBadSortPagination(servers[0].url, basePath, servers[0].accessToken) }) }) after(async function () { - killallServers([ server ]) + killallServers(servers) // Keep the logs if the test failed if (this['ok']) { diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts index 7bf187007..6dd9f15f7 100644 --- a/server/tests/api/check-params/video-imports.ts +++ b/server/tests/api/check-params/video-imports.ts @@ -88,6 +88,7 @@ describe('Test video imports API validator', function () { language: 'pt', nsfw: false, commentsEnabled: true, + downloadEnabled: true, waitTranscoding: true, description: 'my super description', support: 'my super support text', diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts index f26b91435..878ffe025 100644 --- a/server/tests/api/check-params/videos.ts +++ b/server/tests/api/check-params/videos.ts @@ -179,6 +179,7 @@ describe('Test videos API validator', function () { language: 'pt', nsfw: false, commentsEnabled: true, + downloadEnabled: true, waitTranscoding: true, description: 'my super description', support: 'my super support text', @@ -428,6 +429,7 @@ describe('Test videos API validator', function () { language: 'pt', nsfw: false, commentsEnabled: false, + downloadEnabled: false, description: 'my super description', privacy: VideoPrivacy.PUBLIC, tags: [ 'tag1', 'tag2' ] diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts index 9d3ce8153..778611fff 100644 --- a/server/tests/api/redundancy/redundancy.ts +++ b/server/tests/api/redundancy/redundancy.ts @@ -17,7 +17,7 @@ import { viewVideo, wait, waitUntilLog, - checkVideoFilesWereRemoved, removeVideo, getVideoWithToken + checkVideoFilesWereRemoved, removeVideo, getVideoWithToken, reRunServer, checkSegmentHash } from '../../../../shared/utils' import { waitJobs } from '../../../../shared/utils/server/jobs' @@ -48,6 +48,11 @@ function checkMagnetWebseeds (file: { magnetUri: string, resolution: { id: numbe async function runServers (strategy: VideoRedundancyStrategy, additionalParams: any = {}) { const config = { + transcoding: { + hls: { + enabled: true + } + }, redundancy: { videos: { check_interval: '5 seconds', @@ -85,7 +90,7 @@ async function runServers (strategy: VideoRedundancyStrategy, additionalParams: await waitJobs(servers) } -async function check1WebSeed (strategy: VideoRedundancyStrategy, videoUUID?: string) { +async function check1WebSeed (videoUUID?: string) { if (!videoUUID) videoUUID = video1Server2UUID const webseeds = [ @@ -93,47 +98,17 @@ async function check1WebSeed (strategy: VideoRedundancyStrategy, videoUUID?: str ] for (const server of servers) { - { - // With token to avoid issues with video follow constraints - const res = await getVideoWithToken(server.url, server.accessToken, videoUUID) + // With token to avoid issues with video follow constraints + const res = await getVideoWithToken(server.url, server.accessToken, videoUUID) - const video: VideoDetails = res.body - for (const f of video.files) { - checkMagnetWebseeds(f, webseeds, server) - } + const video: VideoDetails = res.body + for (const f of video.files) { + checkMagnetWebseeds(f, webseeds, server) } } } -async function checkStatsWith2Webseed (strategy: VideoRedundancyStrategy) { - const res = await getStats(servers[0].url) - const data: ServerStats = res.body - - expect(data.videosRedundancy).to.have.lengthOf(1) - const stat = data.videosRedundancy[0] - - expect(stat.strategy).to.equal(strategy) - expect(stat.totalSize).to.equal(204800) - expect(stat.totalUsed).to.be.at.least(1).and.below(204801) - expect(stat.totalVideoFiles).to.equal(4) - expect(stat.totalVideos).to.equal(1) -} - -async function checkStatsWith1Webseed (strategy: VideoRedundancyStrategy) { - const res = await getStats(servers[0].url) - const data: ServerStats = res.body - - expect(data.videosRedundancy).to.have.lengthOf(1) - - const stat = data.videosRedundancy[0] - expect(stat.strategy).to.equal(strategy) - expect(stat.totalSize).to.equal(204800) - expect(stat.totalUsed).to.equal(0) - expect(stat.totalVideoFiles).to.equal(0) - expect(stat.totalVideos).to.equal(0) -} - -async function check2Webseeds (strategy: VideoRedundancyStrategy, videoUUID?: string) { +async function check2Webseeds (videoUUID?: string) { if (!videoUUID) videoUUID = video1Server2UUID const webseeds = [ @@ -158,7 +133,7 @@ async function check2Webseeds (strategy: VideoRedundancyStrategy, videoUUID?: st await makeGetRequest({ url: servers[1].url, statusCodeExpected: 200, - path: '/static/webseed/' + `${videoUUID}-${file.resolution.id}.mp4`, + path: `/static/webseed/${videoUUID}-${file.resolution.id}.mp4`, contentType: null }) } @@ -174,6 +149,85 @@ async function check2Webseeds (strategy: VideoRedundancyStrategy, videoUUID?: st } } +async function check0PlaylistRedundancies (videoUUID?: string) { + if (!videoUUID) videoUUID = video1Server2UUID + + for (const server of servers) { + // With token to avoid issues with video follow constraints + const res = await getVideoWithToken(server.url, server.accessToken, videoUUID) + const video: VideoDetails = res.body + + expect(video.streamingPlaylists).to.be.an('array') + expect(video.streamingPlaylists).to.have.lengthOf(1) + expect(video.streamingPlaylists[0].redundancies).to.have.lengthOf(0) + } +} + +async function check1PlaylistRedundancies (videoUUID?: string) { + if (!videoUUID) videoUUID = video1Server2UUID + + for (const server of servers) { + const res = await getVideo(server.url, videoUUID) + const video: VideoDetails = res.body + + expect(video.streamingPlaylists).to.have.lengthOf(1) + expect(video.streamingPlaylists[0].redundancies).to.have.lengthOf(1) + + const redundancy = video.streamingPlaylists[0].redundancies[0] + + expect(redundancy.baseUrl).to.equal(servers[0].url + '/static/redundancy/hls/' + videoUUID) + } + + const baseUrlPlaylist = servers[1].url + '/static/playlists/hls' + const baseUrlSegment = servers[0].url + '/static/redundancy/hls' + + const res = await getVideo(servers[0].url, videoUUID) + const hlsPlaylist = (res.body as VideoDetails).streamingPlaylists[0] + + for (const resolution of [ 240, 360, 480, 720 ]) { + await checkSegmentHash(baseUrlPlaylist, baseUrlSegment, videoUUID, resolution, hlsPlaylist) + } + + for (const directory of [ 'test1/redundancy/hls', 'test2/playlists/hls' ]) { + const files = await readdir(join(root(), directory, videoUUID)) + expect(files).to.have.length.at.least(4) + + for (const resolution of [ 240, 360, 480, 720 ]) { + const filename = `${videoUUID}-${resolution}-fragmented.mp4` + + expect(files.find(f => f === filename)).to.not.be.undefined + } + } +} + +async function checkStatsWith2Webseed (strategy: VideoRedundancyStrategy) { + const res = await getStats(servers[0].url) + const data: ServerStats = res.body + + expect(data.videosRedundancy).to.have.lengthOf(1) + const stat = data.videosRedundancy[0] + + expect(stat.strategy).to.equal(strategy) + expect(stat.totalSize).to.equal(204800) + expect(stat.totalUsed).to.be.at.least(1).and.below(204801) + expect(stat.totalVideoFiles).to.equal(4) + expect(stat.totalVideos).to.equal(1) +} + +async function checkStatsWith1Webseed (strategy: VideoRedundancyStrategy) { + const res = await getStats(servers[0].url) + const data: ServerStats = res.body + + expect(data.videosRedundancy).to.have.lengthOf(1) + + const stat = data.videosRedundancy[0] + expect(stat.strategy).to.equal(strategy) + expect(stat.totalSize).to.equal(204800) + expect(stat.totalUsed).to.equal(0) + expect(stat.totalVideoFiles).to.equal(0) + expect(stat.totalVideos).to.equal(0) +} + async function enableRedundancyOnServer1 () { await updateRedundancy(servers[ 0 ].url, servers[ 0 ].accessToken, servers[ 1 ].host, true) @@ -220,7 +274,8 @@ describe('Test videos redundancy', function () { }) it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) + await check1WebSeed() + await check0PlaylistRedundancies() await checkStatsWith1Webseed(strategy) }) @@ -229,27 +284,29 @@ describe('Test videos redundancy', function () { }) it('Should have 2 webseeds on the first video', async function () { - this.timeout(40000) + this.timeout(80000) await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) + await waitUntilLog(servers[0], 'Duplicated ', 5) await waitJobs(servers) - await check2Webseeds(strategy) + await check2Webseeds() + await check1PlaylistRedundancies() await checkStatsWith2Webseed(strategy) }) it('Should undo redundancy on server 1 and remove duplicated videos', async function () { - this.timeout(40000) + this.timeout(80000) await disableRedundancyOnServer1() await waitJobs(servers) await wait(5000) - await check1WebSeed(strategy) + await check1WebSeed() + await check0PlaylistRedundancies() - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) + await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos', join('playlists', 'hls') ]) }) after(function () { @@ -267,7 +324,8 @@ describe('Test videos redundancy', function () { }) it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) + await check1WebSeed() + await check0PlaylistRedundancies() await checkStatsWith1Webseed(strategy) }) @@ -276,25 +334,27 @@ describe('Test videos redundancy', function () { }) it('Should have 2 webseeds on the first video', async function () { - this.timeout(40000) + this.timeout(80000) await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) + await waitUntilLog(servers[0], 'Duplicated ', 5) await waitJobs(servers) - await check2Webseeds(strategy) + await check2Webseeds() + await check1PlaylistRedundancies() await checkStatsWith2Webseed(strategy) }) it('Should unfollow on server 1 and remove duplicated videos', async function () { - this.timeout(40000) + this.timeout(80000) await unfollow(servers[0].url, servers[0].accessToken, servers[1]) await waitJobs(servers) await wait(5000) - await check1WebSeed(strategy) + await check1WebSeed() + await check0PlaylistRedundancies() await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) }) @@ -314,7 +374,8 @@ describe('Test videos redundancy', function () { }) it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) + await check1WebSeed() + await check0PlaylistRedundancies() await checkStatsWith1Webseed(strategy) }) @@ -323,18 +384,19 @@ describe('Test videos redundancy', function () { }) it('Should still have 1 webseed on the first video', async function () { - this.timeout(40000) + this.timeout(80000) await waitJobs(servers) await wait(15000) await waitJobs(servers) - await check1WebSeed(strategy) + await check1WebSeed() + await check0PlaylistRedundancies() await checkStatsWith1Webseed(strategy) }) it('Should view 2 times the first video to have > min_views config', async function () { - this.timeout(40000) + this.timeout(80000) await viewVideo(servers[ 0 ].url, video1Server2UUID) await viewVideo(servers[ 2 ].url, video1Server2UUID) @@ -344,13 +406,14 @@ describe('Test videos redundancy', function () { }) it('Should have 2 webseeds on the first video', async function () { - this.timeout(40000) + this.timeout(80000) await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) + await waitUntilLog(servers[0], 'Duplicated ', 5) await waitJobs(servers) - await check2Webseeds(strategy) + await check2Webseeds() + await check1PlaylistRedundancies() await checkStatsWith2Webseed(strategy) }) @@ -405,7 +468,7 @@ describe('Test videos redundancy', function () { }) it('Should still have 2 webseeds after 10 seconds', async function () { - this.timeout(40000) + this.timeout(80000) await wait(10000) @@ -420,7 +483,7 @@ describe('Test videos redundancy', function () { }) it('Should stop server 1 and expire video redundancy', async function () { - this.timeout(40000) + this.timeout(80000) killallServers([ servers[0] ]) @@ -446,10 +509,11 @@ describe('Test videos redundancy', function () { await enableRedundancyOnServer1() await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) + await waitUntilLog(servers[0], 'Duplicated ', 5) await waitJobs(servers) - await check2Webseeds(strategy) + await check2Webseeds() + await check1PlaylistRedundancies() await checkStatsWith2Webseed(strategy) const res = await uploadVideo(servers[ 1 ].url, servers[ 1 ].accessToken, { name: 'video 2 server 2' }) @@ -467,8 +531,10 @@ describe('Test videos redundancy', function () { await wait(1000) try { - await check1WebSeed(strategy, video1Server2UUID) - await check2Webseeds(strategy, video2Server2UUID) + await check1WebSeed(video1Server2UUID) + await check0PlaylistRedundancies(video1Server2UUID) + await check2Webseeds(video2Server2UUID) + await check1PlaylistRedundancies(video2Server2UUID) checked = true } catch { @@ -477,6 +543,26 @@ describe('Test videos redundancy', function () { } }) + it('Should disable strategy and remove redundancies', async function () { + this.timeout(80000) + + await waitJobs(servers) + + killallServers([ servers[ 0 ] ]) + await reRunServer(servers[ 0 ], { + redundancy: { + videos: { + check_interval: '1 second', + strategies: [] + } + } + }) + + await waitJobs(servers) + + await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ join('redundancy', 'hls') ]) + }) + after(function () { return cleanServers() }) diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index bebfc7398..0dfe6e4fe 100644 --- a/server/tests/api/server/config.ts +++ b/server/tests/api/server/config.ts @@ -57,6 +57,8 @@ function checkInitialConfig (data: CustomConfig) { expect(data.transcoding.resolutions['480p']).to.be.true expect(data.transcoding.resolutions['720p']).to.be.true expect(data.transcoding.resolutions['1080p']).to.be.true + expect(data.transcoding.hls.enabled).to.be.true + expect(data.import.videos.http.enabled).to.be.true expect(data.import.videos.torrent.enabled).to.be.true } @@ -95,6 +97,7 @@ function checkUpdatedConfig (data: CustomConfig) { expect(data.transcoding.resolutions['480p']).to.be.true expect(data.transcoding.resolutions['720p']).to.be.false expect(data.transcoding.resolutions['1080p']).to.be.false + expect(data.transcoding.hls.enabled).to.be.false expect(data.import.videos.http.enabled).to.be.false expect(data.import.videos.torrent.enabled).to.be.false @@ -205,6 +208,9 @@ describe('Test config', function () { '480p': true, '720p': false, '1080p': false + }, + hls: { + enabled: false } }, import: { diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts index b0fc5d293..ad4c87c73 100644 --- a/server/tests/api/server/follows.ts +++ b/server/tests/api/server/follows.ts @@ -348,6 +348,7 @@ describe('Test follows', function () { }, isLocal, commentsEnabled: true, + downloadEnabled: true, duration: 5, tags: [ 'tag1', 'tag2', 'tag3' ], privacy: VideoPrivacy.PUBLIC, diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index cd7baadad..cd5acbe16 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts @@ -76,6 +76,7 @@ describe('Test handle downs', function () { tags: [ 'tag1p1', 'tag2p1' ], privacy: VideoPrivacy.PUBLIC, commentsEnabled: true, + downloadEnabled: true, channel: { name: 'root_channel', displayName: 'Main root channel', diff --git a/server/tests/api/server/redundancy.ts b/server/tests/api/server/redundancy.ts deleted file mode 100644 index 8053d0491..000000000 --- a/server/tests/api/server/redundancy.ts +++ /dev/null @@ -1,479 +0,0 @@ -/* tslint:disable:no-unused-expression */ - -import * as chai from 'chai' -import 'mocha' -import { VideoDetails } from '../../../../shared/models/videos' -import { - doubleFollow, - flushAndRunMultipleServers, - getFollowingListPaginationAndSort, - getVideo, - immutableAssign, - killallServers, makeGetRequest, - root, - ServerInfo, - setAccessTokensToServers, unfollow, - uploadVideo, - viewVideo, - wait, - waitUntilLog, - checkVideoFilesWereRemoved, removeVideo -} from '../../../../shared/utils' -import { waitJobs } from '../../../../shared/utils/server/jobs' -import * as magnetUtil from 'magnet-uri' -import { updateRedundancy } from '../../../../shared/utils/server/redundancy' -import { ActorFollow } from '../../../../shared/models/actors' -import { readdir } from 'fs-extra' -import { join } from 'path' -import { VideoRedundancyStrategy } from '../../../../shared/models/redundancy' -import { getStats } from '../../../../shared/utils/server/stats' -import { ServerStats } from '../../../../shared/models/server/server-stats.model' - -const expect = chai.expect - -let servers: ServerInfo[] = [] -let video1Server2UUID: string - -function checkMagnetWebseeds (file: { magnetUri: string, resolution: { id: number } }, baseWebseeds: string[], server: ServerInfo) { - const parsed = magnetUtil.decode(file.magnetUri) - - for (const ws of baseWebseeds) { - const found = parsed.urlList.find(url => url === `${ws}-${file.resolution.id}.mp4`) - expect(found, `Webseed ${ws} not found in ${file.magnetUri} on server ${server.url}`).to.not.be.undefined - } - - expect(parsed.urlList).to.have.lengthOf(baseWebseeds.length) -} - -async function runServers (strategy: VideoRedundancyStrategy, additionalParams: any = {}) { - const config = { - redundancy: { - videos: { - check_interval: '5 seconds', - strategies: [ - immutableAssign({ - min_lifetime: '1 hour', - strategy: strategy, - size: '100KB' - }, additionalParams) - ] - } - } - } - servers = await flushAndRunMultipleServers(3, config) - - // Get the access tokens - await setAccessTokensToServers(servers) - - { - const res = await uploadVideo(servers[ 1 ].url, servers[ 1 ].accessToken, { name: 'video 1 server 2' }) - video1Server2UUID = res.body.video.uuid - - await viewVideo(servers[ 1 ].url, video1Server2UUID) - } - - await waitJobs(servers) - - // Server 1 and server 2 follow each other - await doubleFollow(servers[ 0 ], servers[ 1 ]) - // Server 1 and server 3 follow each other - await doubleFollow(servers[ 0 ], servers[ 2 ]) - // Server 2 and server 3 follow each other - await doubleFollow(servers[ 1 ], servers[ 2 ]) - - await waitJobs(servers) -} - -async function check1WebSeed (strategy: VideoRedundancyStrategy, videoUUID?: string) { - if (!videoUUID) videoUUID = video1Server2UUID - - const webseeds = [ - 'http://localhost:9002/static/webseed/' + videoUUID - ] - - for (const server of servers) { - { - const res = await getVideo(server.url, videoUUID) - - const video: VideoDetails = res.body - for (const f of video.files) { - checkMagnetWebseeds(f, webseeds, server) - } - } - } -} - -async function checkStatsWith2Webseed (strategy: VideoRedundancyStrategy) { - const res = await getStats(servers[0].url) - const data: ServerStats = res.body - - expect(data.videosRedundancy).to.have.lengthOf(1) - const stat = data.videosRedundancy[0] - - expect(stat.strategy).to.equal(strategy) - expect(stat.totalSize).to.equal(102400) - expect(stat.totalUsed).to.be.at.least(1).and.below(102401) - expect(stat.totalVideoFiles).to.equal(4) - expect(stat.totalVideos).to.equal(1) -} - -async function checkStatsWith1Webseed (strategy: VideoRedundancyStrategy) { - const res = await getStats(servers[0].url) - const data: ServerStats = res.body - - expect(data.videosRedundancy).to.have.lengthOf(1) - - const stat = data.videosRedundancy[0] - expect(stat.strategy).to.equal(strategy) - expect(stat.totalSize).to.equal(102400) - expect(stat.totalUsed).to.equal(0) - expect(stat.totalVideoFiles).to.equal(0) - expect(stat.totalVideos).to.equal(0) -} - -async function check2Webseeds (strategy: VideoRedundancyStrategy, videoUUID?: string) { - if (!videoUUID) videoUUID = video1Server2UUID - - const webseeds = [ - 'http://localhost:9001/static/webseed/' + videoUUID, - 'http://localhost:9002/static/webseed/' + videoUUID - ] - - for (const server of servers) { - const res = await getVideo(server.url, videoUUID) - - const video: VideoDetails = res.body - - for (const file of video.files) { - checkMagnetWebseeds(file, webseeds, server) - - // Only servers 1 and 2 have the video - if (server.serverNumber !== 3) { - await makeGetRequest({ - url: server.url, - statusCodeExpected: 200, - path: '/static/webseed/' + `${videoUUID}-${file.resolution.id}.mp4`, - contentType: null - }) - } - } - } - - for (const directory of [ 'test1', 'test2' ]) { - const files = await readdir(join(root(), directory, 'videos')) - expect(files).to.have.length.at.least(4) - - for (const resolution of [ 240, 360, 480, 720 ]) { - expect(files.find(f => f === `${videoUUID}-${resolution}.mp4`)).to.not.be.undefined - } - } -} - -async function enableRedundancyOnServer1 () { - await updateRedundancy(servers[ 0 ].url, servers[ 0 ].accessToken, servers[ 1 ].host, true) - - const res = await getFollowingListPaginationAndSort(servers[ 0 ].url, 0, 5, '-createdAt') - const follows: ActorFollow[] = res.body.data - const server2 = follows.find(f => f.following.host === 'localhost:9002') - const server3 = follows.find(f => f.following.host === 'localhost:9003') - - expect(server3).to.not.be.undefined - expect(server3.following.hostRedundancyAllowed).to.be.false - - expect(server2).to.not.be.undefined - expect(server2.following.hostRedundancyAllowed).to.be.true -} - -async function disableRedundancyOnServer1 () { - await updateRedundancy(servers[ 0 ].url, servers[ 0 ].accessToken, servers[ 1 ].host, false) - - const res = await getFollowingListPaginationAndSort(servers[ 0 ].url, 0, 5, '-createdAt') - const follows: ActorFollow[] = res.body.data - const server2 = follows.find(f => f.following.host === 'localhost:9002') - const server3 = follows.find(f => f.following.host === 'localhost:9003') - - expect(server3).to.not.be.undefined - expect(server3.following.hostRedundancyAllowed).to.be.false - - expect(server2).to.not.be.undefined - expect(server2.following.hostRedundancyAllowed).to.be.false -} - -async function cleanServers () { - killallServers(servers) -} - -describe('Test videos redundancy', function () { - - describe('With most-views strategy', function () { - const strategy = 'most-views' - - before(function () { - this.timeout(120000) - - return runServers(strategy) - }) - - it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should enable redundancy on server 1', function () { - return enableRedundancyOnServer1() - }) - - it('Should have 2 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - }) - - it('Should undo redundancy on server 1 and remove duplicated videos', async function () { - this.timeout(40000) - - await disableRedundancyOnServer1() - - await waitJobs(servers) - await wait(5000) - - await check1WebSeed(strategy) - - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) - }) - - after(function () { - return cleanServers() - }) - }) - - describe('With trending strategy', function () { - const strategy = 'trending' - - before(function () { - this.timeout(120000) - - return runServers(strategy) - }) - - it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should enable redundancy on server 1', function () { - return enableRedundancyOnServer1() - }) - - it('Should have 2 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - }) - - it('Should unfollow on server 1 and remove duplicated videos', async function () { - this.timeout(40000) - - await unfollow(servers[0].url, servers[0].accessToken, servers[1]) - - await waitJobs(servers) - await wait(5000) - - await check1WebSeed(strategy) - - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) - }) - - after(function () { - return cleanServers() - }) - }) - - describe('With recently added strategy', function () { - const strategy = 'recently-added' - - before(function () { - this.timeout(120000) - - return runServers(strategy, { min_views: 3 }) - }) - - it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should enable redundancy on server 1', function () { - return enableRedundancyOnServer1() - }) - - it('Should still have 1 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await wait(15000) - await waitJobs(servers) - - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should view 2 times the first video to have > min_views config', async function () { - this.timeout(40000) - - await viewVideo(servers[ 0 ].url, video1Server2UUID) - await viewVideo(servers[ 2 ].url, video1Server2UUID) - - await wait(10000) - await waitJobs(servers) - }) - - it('Should have 2 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - }) - - it('Should remove the video and the redundancy files', async function () { - this.timeout(20000) - - await removeVideo(servers[1].url, servers[1].accessToken, video1Server2UUID) - - await waitJobs(servers) - - for (const server of servers) { - await checkVideoFilesWereRemoved(video1Server2UUID, server.serverNumber) - } - }) - - after(function () { - return cleanServers() - }) - }) - - describe('Test expiration', function () { - const strategy = 'recently-added' - - async function checkContains (servers: ServerInfo[], str: string) { - for (const server of servers) { - const res = await getVideo(server.url, video1Server2UUID) - const video: VideoDetails = res.body - - for (const f of video.files) { - expect(f.magnetUri).to.contain(str) - } - } - } - - async function checkNotContains (servers: ServerInfo[], str: string) { - for (const server of servers) { - const res = await getVideo(server.url, video1Server2UUID) - const video: VideoDetails = res.body - - for (const f of video.files) { - expect(f.magnetUri).to.not.contain(str) - } - } - } - - before(async function () { - this.timeout(120000) - - await runServers(strategy, { min_lifetime: '7 seconds', min_views: 0 }) - - await enableRedundancyOnServer1() - }) - - it('Should still have 2 webseeds after 10 seconds', async function () { - this.timeout(40000) - - await wait(10000) - - try { - await checkContains(servers, 'http%3A%2F%2Flocalhost%3A9001') - } catch { - // Maybe a server deleted a redundancy in the scheduler - await wait(2000) - - await checkContains(servers, 'http%3A%2F%2Flocalhost%3A9001') - } - }) - - it('Should stop server 1 and expire video redundancy', async function () { - this.timeout(40000) - - killallServers([ servers[0] ]) - - await wait(15000) - - await checkNotContains([ servers[1], servers[2] ], 'http%3A%2F%2Flocalhost%3A9001') - }) - - after(function () { - return killallServers([ servers[1], servers[2] ]) - }) - }) - - describe('Test file replacement', function () { - let video2Server2UUID: string - const strategy = 'recently-added' - - before(async function () { - this.timeout(120000) - - await runServers(strategy, { min_lifetime: '7 seconds', min_views: 0 }) - - await enableRedundancyOnServer1() - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - - const res = await uploadVideo(servers[ 1 ].url, servers[ 1 ].accessToken, { name: 'video 2 server 2' }) - video2Server2UUID = res.body.video.uuid - }) - - it('Should cache video 2 webseed on the first video', async function () { - this.timeout(120000) - - await waitJobs(servers) - - let checked = false - - while (checked === false) { - await wait(1000) - - try { - await check1WebSeed(strategy, video1Server2UUID) - await check2Webseeds(strategy, video2Server2UUID) - - checked = true - } catch { - checked = false - } - } - }) - - after(function () { - return cleanServers() - }) - }) -}) diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts index d4c08c346..ee0fffd5a 100644 --- a/server/tests/api/server/reverse-proxy.ts +++ b/server/tests/api/server/reverse-proxy.ts @@ -95,7 +95,7 @@ describe('Test application behind a reverse proxy', function () { it('Should rate limit logins', async function () { const user = { username: 'root', password: 'fail' } - for (let i = 0; i < 14; i++) { + for (let i = 0; i < 19; i++) { await userLogin(server, user, 400) } diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts index 517b4e542..aaa6c62f7 100644 --- a/server/tests/api/server/stats.ts +++ b/server/tests/api/server/stats.ts @@ -39,7 +39,7 @@ describe('Test stats (excluding redundancy)', function () { } await createUser(servers[0].url, servers[0].accessToken, user.username, user.password) - const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, {}) + const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, { fixture: 'video_short.webm' }) const videoUUID = resVideo.body.video.uuid await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, 'comment') @@ -60,6 +60,7 @@ describe('Test stats (excluding redundancy)', function () { expect(data.totalLocalVideoComments).to.equal(1) expect(data.totalLocalVideos).to.equal(1) expect(data.totalLocalVideoViews).to.equal(1) + expect(data.totalLocalVideoFilesSize).to.equal(218910) expect(data.totalUsers).to.equal(2) expect(data.totalVideoComments).to.equal(1) expect(data.totalVideos).to.equal(1) @@ -74,6 +75,7 @@ describe('Test stats (excluding redundancy)', function () { expect(data.totalLocalVideoComments).to.equal(0) expect(data.totalLocalVideos).to.equal(0) expect(data.totalLocalVideoViews).to.equal(0) + expect(data.totalLocalVideoFilesSize).to.equal(0) expect(data.totalUsers).to.equal(1) expect(data.totalVideoComments).to.equal(1) expect(data.totalVideos).to.equal(1) diff --git a/server/tests/api/users/user-notifications.ts b/server/tests/api/users/user-notifications.ts index 5260d64cc..69e51677e 100644 --- a/server/tests/api/users/user-notifications.ts +++ b/server/tests/api/users/user-notifications.ts @@ -165,6 +165,8 @@ describe('Test users notifications', function () { }) it('Should not send notifications if the user does not follow the video publisher', async function () { + this.timeout(10000) + await uploadVideoByLocalAccount(servers) const notification = await getLastNotification(servers[ 0 ].url, userAccessToken) @@ -644,6 +646,8 @@ describe('Test users notifications', function () { }) it('Should not send a notification if transcoding is not enabled', async function () { + this.timeout(10000) + const { name, uuid } = await uploadVideoByLocalAccount(servers) await waitJobs(servers) @@ -717,6 +721,24 @@ describe('Test users notifications', function () { await wait(6000) await checkVideoIsPublished(baseParams, name, uuid, 'presence') }) + + it('Should not send a notification before the video is published', async function () { + this.timeout(20000) + + let updateAt = new Date(new Date().getTime() + 100000) + + const data = { + privacy: VideoPrivacy.PRIVATE, + scheduleUpdate: { + updateAt: updateAt.toISOString(), + privacy: VideoPrivacy.PUBLIC + } + } + const { name, uuid } = await uploadVideoByRemoteAccount(servers, data) + + await wait(6000) + await checkVideoIsPublished(baseParams, name, uuid, 'absence') + }) }) describe('My video is imported', function () { @@ -781,6 +803,8 @@ describe('Test users notifications', function () { }) it('Should send a notification only to moderators when a user registers on the instance', async function () { + this.timeout(10000) + await registerUser(servers[0].url, 'user_45', 'password') await waitJobs(servers) @@ -849,6 +873,8 @@ describe('Test users notifications', function () { }) it('Should notify when a local account is following one of our channel', async function () { + this.timeout(10000) + await addUserSubscription(servers[0].url, servers[0].accessToken, 'user_1@localhost:9001') await waitJobs(servers) @@ -857,6 +883,8 @@ describe('Test users notifications', function () { }) it('Should notify when a remote account is following one of our channel', async function () { + this.timeout(10000) + await addUserSubscription(servers[1].url, servers[1].accessToken, 'user_1@localhost:9001') await waitJobs(servers) @@ -926,6 +954,8 @@ describe('Test users notifications', function () { }) it('Should not have notifications', async function () { + this.timeout(10000) + await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, { newVideoFromSubscription: UserNotificationSettingValue.NONE })) @@ -943,6 +973,8 @@ describe('Test users notifications', function () { }) it('Should only have web notifications', async function () { + this.timeout(10000) + await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, { newVideoFromSubscription: UserNotificationSettingValue.WEB })) @@ -967,6 +999,8 @@ describe('Test users notifications', function () { }) it('Should only have mail notifications', async function () { + this.timeout(10000) + await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, { newVideoFromSubscription: UserNotificationSettingValue.EMAIL })) @@ -991,6 +1025,8 @@ describe('Test users notifications', function () { }) it('Should have email and web notifications', async function () { + this.timeout(10000) + await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, { newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL })) diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index ad98ab1c7..c4465d541 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -501,6 +501,22 @@ describe('Test users', function () { accessTokenUser = await userLogin(server, user) }) + it('Should be able to update another user password', async function () { + await updateUser({ + url: server.url, + userId, + accessToken, + password: 'password updated' + }) + + await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401) + + await userLogin(server, user, 400) + + user.password = 'password updated' + accessTokenUser = await userLogin(server, user) + }) + it('Should be able to list video blacklist by a moderator', async function () { await getBlacklistedVideosList(server.url, accessTokenUser) }) diff --git a/server/tests/api/videos/index.ts b/server/tests/api/videos/index.ts index 9bdb78491..a501a80b2 100644 --- a/server/tests/api/videos/index.ts +++ b/server/tests/api/videos/index.ts @@ -3,12 +3,12 @@ import './services' import './single-server' import './video-abuse' import './video-blacklist' -import './video-blacklist-management' import './video-captions' import './video-change-ownership' import './video-channels' import './video-comments' import './video-description' +import './video-hls' import './video-imports' import './video-nsfw' import './video-privacy' diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 6c281e49e..1b471ba79 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -128,6 +128,7 @@ describe('Test multiple servers', function () { tags: [ 'tag1p1', 'tag2p1' ], privacy: VideoPrivacy.PUBLIC, commentsEnabled: true, + downloadEnabled: true, channel: { displayName: 'my channel', name: 'super_channel_name', @@ -199,6 +200,7 @@ describe('Test multiple servers', function () { }, isLocal, commentsEnabled: true, + downloadEnabled: true, duration: 5, tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ], privacy: VideoPrivacy.PUBLIC, @@ -307,6 +309,7 @@ describe('Test multiple servers', function () { isLocal, duration: 5, commentsEnabled: true, + downloadEnabled: true, tags: [ 'tag1p3' ], privacy: VideoPrivacy.PUBLIC, channel: { @@ -338,6 +341,7 @@ describe('Test multiple servers', function () { host: 'localhost:9003' }, commentsEnabled: true, + downloadEnabled: true, isLocal, duration: 5, tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ], @@ -655,6 +659,7 @@ describe('Test multiple servers', function () { isLocal, duration: 5, commentsEnabled: true, + downloadEnabled: true, tags: [ 'tag_up_1', 'tag_up_2' ], privacy: VideoPrivacy.PUBLIC, channel: { @@ -914,11 +919,12 @@ describe('Test multiple servers', function () { } }) - it('Should disable comments', async function () { + it('Should disable comments and download', async function () { this.timeout(20000) const attributes = { - commentsEnabled: false + commentsEnabled: false, + downloadEnabled: false } await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, attributes) @@ -928,6 +934,7 @@ describe('Test multiple servers', function () { for (const server of servers) { const res = await getVideo(server.url, videoUUID) expect(res.body.commentsEnabled).to.be.false + expect(res.body.downloadEnabled).to.be.false const text = 'my super forbidden comment' await addVideoCommentThread(server.url, server.accessToken, videoUUID, text, 409) @@ -976,6 +983,7 @@ describe('Test multiple servers', function () { isLocal, duration: 5, commentsEnabled: false, + downloadEnabled: false, tags: [ ], privacy: VideoPrivacy.PUBLIC, channel: { diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index 069dec67c..cfdcbaf3f 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -55,6 +55,7 @@ describe('Test a single server', function () { tags: [ 'tag1', 'tag2', 'tag3' ], privacy: VideoPrivacy.PUBLIC, commentsEnabled: true, + downloadEnabled: true, channel: { displayName: 'Main root channel', name: 'root_channel', @@ -87,6 +88,7 @@ describe('Test a single server', function () { privacy: VideoPrivacy.PUBLIC, duration: 5, commentsEnabled: false, + downloadEnabled: false, channel: { name: 'root_channel', displayName: 'Main root channel', @@ -356,6 +358,7 @@ describe('Test a single server', function () { nsfw: false, description: 'my super description updated', commentsEnabled: false, + downloadEnabled: false, tags: [ 'tagup1', 'tagup2' ] } await updateVideo(server.url, server.accessToken, videoId, attributes) diff --git a/server/tests/api/videos/video-blacklist-management.ts b/server/tests/api/videos/video-blacklist-management.ts deleted file mode 100644 index 61411e30d..000000000 --- a/server/tests/api/videos/video-blacklist-management.ts +++ /dev/null @@ -1,192 +0,0 @@ -/* tslint:disable:no-unused-expression */ - -import * as chai from 'chai' -import { orderBy } from 'lodash' -import 'mocha' -import { - addVideoToBlacklist, - flushAndRunMultipleServers, - getBlacklistedVideosList, - getMyVideos, - getSortedBlacklistedVideosList, - getVideosList, - killallServers, - removeVideoFromBlacklist, - ServerInfo, - setAccessTokensToServers, - updateVideoBlacklist, - uploadVideo -} from '../../../../shared/utils/index' -import { doubleFollow } from '../../../../shared/utils/server/follows' -import { waitJobs } from '../../../../shared/utils/server/jobs' -import { VideoAbuse } from '../../../../shared/models/videos' - -const expect = chai.expect - -describe('Test video blacklist management', function () { - let servers: ServerInfo[] = [] - let videoId: number - - async function blacklistVideosOnServer (server: ServerInfo) { - const res = await getVideosList(server.url) - - const videos = res.body.data - for (let video of videos) { - await addVideoToBlacklist(server.url, server.accessToken, video.id, 'super reason') - } - } - - before(async function () { - this.timeout(50000) - - // Run servers - servers = await flushAndRunMultipleServers(2) - - // Get the access tokens - await setAccessTokensToServers(servers) - - // Server 1 and server 2 follow each other - await doubleFollow(servers[0], servers[1]) - - // Upload 2 videos on server 2 - await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 1st video', description: 'A video on server 2' }) - await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' }) - - // Wait videos propagation, server 2 has transcoding enabled - await waitJobs(servers) - - // Blacklist the two videos on server 1 - await blacklistVideosOnServer(servers[0]) - }) - - describe('When listing blacklisted videos', function () { - it('Should display all the blacklisted videos', async function () { - const res = await getBlacklistedVideosList(servers[0].url, servers[0].accessToken) - - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - for (const blacklistedVideo of blacklistedVideos) { - expect(blacklistedVideo.reason).to.equal('super reason') - videoId = blacklistedVideo.video.id - } - }) - - it('Should get the correct sort when sorting by descending id', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-id') - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - const result = orderBy(res.body.data, [ 'id' ], [ 'desc' ]) - - expect(blacklistedVideos).to.deep.equal(result) - }) - - it('Should get the correct sort when sorting by descending video name', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - const result = orderBy(res.body.data, [ 'name' ], [ 'desc' ]) - - expect(blacklistedVideos).to.deep.equal(result) - }) - - it('Should get the correct sort when sorting by ascending creation date', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, 'createdAt') - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - const result = orderBy(res.body.data, [ 'createdAt' ]) - - expect(blacklistedVideos).to.deep.equal(result) - }) - }) - - describe('When updating blacklisted videos', function () { - it('Should change the reason', async function () { - await updateVideoBlacklist(servers[0].url, servers[0].accessToken, videoId, 'my super reason updated') - - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - const video = res.body.data.find(b => b.video.id === videoId) - - expect(video.reason).to.equal('my super reason updated') - }) - }) - - describe('When listing my videos', function () { - it('Should display blacklisted videos', async function () { - await blacklistVideosOnServer(servers[1]) - - const res = await getMyVideos(servers[1].url, servers[1].accessToken, 0, 5) - - expect(res.body.total).to.equal(2) - expect(res.body.data).to.have.lengthOf(2) - - for (const video of res.body.data) { - expect(video.blacklisted).to.be.true - expect(video.blacklistedReason).to.equal('super reason') - } - }) - }) - - describe('When removing a blacklisted video', function () { - let videoToRemove: VideoAbuse - let blacklist = [] - - it('Should not have any video in videos list on server 1', async function () { - const res = await getVideosList(servers[0].url) - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) - }) - - it('Should remove a video from the blacklist on server 1', async function () { - // Get one video in the blacklist - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - videoToRemove = res.body.data[0] - blacklist = res.body.data.slice(1) - - // Remove it - await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, videoToRemove.video.id) - }) - - it('Should have the ex-blacklisted video in videos list on server 1', async function () { - const res = await getVideosList(servers[0].url) - expect(res.body.total).to.equal(1) - - const videos = res.body.data - expect(videos).to.be.an('array') - expect(videos.length).to.equal(1) - - expect(videos[0].name).to.equal(videoToRemove.video.name) - expect(videos[0].id).to.equal(videoToRemove.video.id) - }) - - it('Should not have the ex-blacklisted video in videos blacklist list on server 1', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - expect(res.body.total).to.equal(1) - - const videos = res.body.data - expect(videos).to.be.an('array') - expect(videos.length).to.equal(1) - expect(videos).to.deep.equal(blacklist) - }) - }) - - after(async function () { - killallServers(servers) - }) -}) diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts index 1cce82d2a..d39ad63b4 100644 --- a/server/tests/api/videos/video-blacklist.ts +++ b/server/tests/api/videos/video-blacklist.ts @@ -1,24 +1,43 @@ /* tslint:disable:no-unused-expression */ import * as chai from 'chai' +import { orderBy } from 'lodash' import 'mocha' import { addVideoToBlacklist, flushAndRunMultipleServers, + getBlacklistedVideosList, + getMyVideos, + getSortedBlacklistedVideosList, getVideosList, killallServers, + removeVideoFromBlacklist, searchVideo, ServerInfo, setAccessTokensToServers, - uploadVideo + updateVideo, + updateVideoBlacklist, + uploadVideo, + viewVideo } from '../../../../shared/utils/index' import { doubleFollow } from '../../../../shared/utils/server/follows' import { waitJobs } from '../../../../shared/utils/server/jobs' +import { VideoBlacklist } from '../../../../shared/models/videos' const expect = chai.expect -describe('Test video blacklists', function () { +describe('Test video blacklist management', function () { let servers: ServerInfo[] = [] + let videoId: number + + async function blacklistVideosOnServer (server: ServerInfo) { + const res = await getVideosList(server.url) + + const videos = res.body.data + for (let video of videos) { + await addVideoToBlacklist(server.url, server.accessToken, video.id, 'super reason') + } + } before(async function () { this.timeout(50000) @@ -32,58 +51,270 @@ describe('Test video blacklists', function () { // Server 1 and server 2 follow each other await doubleFollow(servers[0], servers[1]) - // Upload a video on server 2 - const videoAttributes = { - name: 'my super name for server 2', - description: 'my super description for server 2' - } - await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes) + // Upload 2 videos on server 2 + await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 1st video', description: 'A video on server 2' }) + await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' }) // Wait videos propagation, server 2 has transcoding enabled await waitJobs(servers) - const res = await getVideosList(servers[0].url) - const videos = res.body.data + // Blacklist the two videos on server 1 + await blacklistVideosOnServer(servers[0]) + }) + + describe('When listing/searching videos', function () { - expect(videos.length).to.equal(1) + it('Should not have the video blacklisted in videos list/search on server 1', async function () { + { + const res = await getVideosList(servers[ 0 ].url) - servers[0].remoteVideo = videos.find(video => video.name === 'my super name for server 2') + expect(res.body.total).to.equal(0) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(0) + } + + { + const res = await searchVideo(servers[ 0 ].url, 'name') + + expect(res.body.total).to.equal(0) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(0) + } + }) + + it('Should have the blacklisted video in videos list/search on server 2', async function () { + { + const res = await getVideosList(servers[ 1 ].url) + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(2) + } + + { + const res = await searchVideo(servers[ 1 ].url, 'video') + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(2) + } + }) }) - it('Should blacklist a remote video on server 1', async function () { - await addVideoToBlacklist(servers[0].url, servers[0].accessToken, servers[0].remoteVideo.id) + describe('When listing blacklisted videos', function () { + it('Should display all the blacklisted videos', async function () { + const res = await getBlacklistedVideosList(servers[0].url, servers[0].accessToken) + + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + for (const blacklistedVideo of blacklistedVideos) { + expect(blacklistedVideo.reason).to.equal('super reason') + videoId = blacklistedVideo.video.id + } + }) + + it('Should get the correct sort when sorting by descending id', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-id') + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + const result = orderBy(res.body.data, [ 'id' ], [ 'desc' ]) + + expect(blacklistedVideos).to.deep.equal(result) + }) + + it('Should get the correct sort when sorting by descending video name', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + const result = orderBy(res.body.data, [ 'name' ], [ 'desc' ]) + + expect(blacklistedVideos).to.deep.equal(result) + }) + + it('Should get the correct sort when sorting by ascending creation date', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, 'createdAt') + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + const result = orderBy(res.body.data, [ 'createdAt' ]) + + expect(blacklistedVideos).to.deep.equal(result) + }) }) - it('Should not have the video blacklisted in videos list on server 1', async function () { - const res = await getVideosList(servers[0].url) + describe('When updating blacklisted videos', function () { + it('Should change the reason', async function () { + await updateVideoBlacklist(servers[0].url, servers[0].accessToken, videoId, 'my super reason updated') + + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + const video = res.body.data.find(b => b.video.id === videoId) - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) + expect(video.reason).to.equal('my super reason updated') + }) }) - it('Should not have the video blacklisted in videos search on server 1', async function () { - const res = await searchVideo(servers[0].url, 'name') + describe('When listing my videos', function () { + it('Should display blacklisted videos', async function () { + await blacklistVideosOnServer(servers[1]) + + const res = await getMyVideos(servers[1].url, servers[1].accessToken, 0, 5) - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) + expect(res.body.total).to.equal(2) + expect(res.body.data).to.have.lengthOf(2) + + for (const video of res.body.data) { + expect(video.blacklisted).to.be.true + expect(video.blacklistedReason).to.equal('super reason') + } + }) }) - it('Should have the blacklisted video in videos list on server 2', async function () { - const res = await getVideosList(servers[1].url) + describe('When removing a blacklisted video', function () { + let videoToRemove: VideoBlacklist + let blacklist = [] + + it('Should not have any video in videos list on server 1', async function () { + const res = await getVideosList(servers[0].url) + expect(res.body.total).to.equal(0) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(0) + }) + + it('Should remove a video from the blacklist on server 1', async function () { + // Get one video in the blacklist + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + videoToRemove = res.body.data[0] + blacklist = res.body.data.slice(1) + + // Remove it + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, videoToRemove.video.id) + }) + + it('Should have the ex-blacklisted video in videos list on server 1', async function () { + const res = await getVideosList(servers[0].url) + expect(res.body.total).to.equal(1) + + const videos = res.body.data + expect(videos).to.be.an('array') + expect(videos.length).to.equal(1) + + expect(videos[0].name).to.equal(videoToRemove.video.name) + expect(videos[0].id).to.equal(videoToRemove.video.id) + }) + + it('Should not have the ex-blacklisted video in videos blacklist list on server 1', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + expect(res.body.total).to.equal(1) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(1) + const videos = res.body.data + expect(videos).to.be.an('array') + expect(videos.length).to.equal(1) + expect(videos).to.deep.equal(blacklist) + }) }) - it('Should have the video blacklisted in videos search on server 2', async function () { - const res = await searchVideo(servers[1].url, 'name') + describe('When blacklisting local videos', function () { + let video3UUID: string + let video4UUID: string + + before(async function () { + this.timeout(10000) + + { + const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'Video 3' }) + video3UUID = res.body.video.uuid + } + { + const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, { name: 'Video 4' }) + video4UUID = res.body.video.uuid + } + + await waitJobs(servers) + }) + + it('Should blacklist video 3 and keep it federated', async function () { + this.timeout(10000) + + await addVideoToBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video3UUID, 'super reason', false) + + await waitJobs(servers) + + { + const res = await getVideosList(servers[ 0 ].url) + expect(res.body.data.find(v => v.uuid === video3UUID)).to.be.undefined + } + + { + const res = await getVideosList(servers[ 1 ].url) + expect(res.body.data.find(v => v.uuid === video3UUID)).to.not.be.undefined + } + }) + + it('Should unfederate the video', async function () { + this.timeout(10000) + + await addVideoToBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID, 'super reason', true) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideosList(server.url) + expect(res.body.data.find(v => v.uuid === video4UUID)).to.be.undefined + } + }) + + it('Should have the video unfederated even after an Update AP message', async function () { + this.timeout(10000) + + await updateVideo(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID, { description: 'super description' }) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideosList(server.url) + expect(res.body.data.find(v => v.uuid === video4UUID)).to.be.undefined + } + }) + + it('Should have the correct video blacklist unfederate attribute', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, 'createdAt') + + const blacklistedVideos: VideoBlacklist[] = res.body.data + const video3Blacklisted = blacklistedVideos.find(b => b.video.uuid === video3UUID) + const video4Blacklisted = blacklistedVideos.find(b => b.video.uuid === video4UUID) + + expect(video3Blacklisted.unfederated).to.be.false + expect(video4Blacklisted.unfederated).to.be.true + }) + + it('Should remove the video from blacklist and refederate the video', async function () { + this.timeout(10000) + + await removeVideoFromBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideosList(server.url) + expect(res.body.data.find(v => v.uuid === video4UUID)).to.not.be.undefined + } + }) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(1) }) after(async function () { diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/videos/video-hls.ts new file mode 100644 index 000000000..a1214bad1 --- /dev/null +++ b/server/tests/api/videos/video-hls.ts @@ -0,0 +1,139 @@ +/* tslint:disable:no-unused-expression */ + +import * as chai from 'chai' +import 'mocha' +import { + checkDirectoryIsEmpty, + checkSegmentHash, + checkTmpIsEmpty, + doubleFollow, + flushAndRunMultipleServers, + flushTests, + getPlaylist, + getVideo, + killallServers, + removeVideo, + ServerInfo, + setAccessTokensToServers, + updateVideo, + uploadVideo, + waitJobs +} from '../../../../shared/utils' +import { VideoDetails } from '../../../../shared/models/videos' +import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type' +import { join } from 'path' + +const expect = chai.expect + +async function checkHlsPlaylist (servers: ServerInfo[], videoUUID: string) { + const resolutions = [ 240, 360, 480, 720 ] + + for (const server of servers) { + const res = await getVideo(server.url, videoUUID) + const videoDetails: VideoDetails = res.body + + expect(videoDetails.streamingPlaylists).to.have.lengthOf(1) + + const hlsPlaylist = videoDetails.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + expect(hlsPlaylist).to.not.be.undefined + + { + const res2 = await getPlaylist(hlsPlaylist.playlistUrl) + + const masterPlaylist = res2.text + + expect(masterPlaylist).to.contain('#EXT-X-STREAM-INF:BANDWIDTH=55472,RESOLUTION=640x360,FRAME-RATE=25') + + for (const resolution of resolutions) { + expect(masterPlaylist).to.contain(`${resolution}.m3u8`) + } + } + + { + for (const resolution of resolutions) { + const res2 = await getPlaylist(`http://localhost:9001/static/playlists/hls/${videoUUID}/${resolution}.m3u8`) + + const subPlaylist = res2.text + expect(subPlaylist).to.contain(`${videoUUID}-${resolution}-fragmented.mp4`) + } + } + + { + const baseUrl = 'http://localhost:9001/static/playlists/hls' + + for (const resolution of resolutions) { + await checkSegmentHash(baseUrl, baseUrl, videoUUID, resolution, hlsPlaylist) + } + } + } +} + +describe('Test HLS videos', function () { + let servers: ServerInfo[] = [] + let videoUUID = '' + + before(async function () { + this.timeout(120000) + + servers = await flushAndRunMultipleServers(2, { transcoding: { enabled: true, hls: { enabled: true } } }) + + // Get the access tokens + await setAccessTokensToServers(servers) + + // Server 1 and server 2 follow each other + await doubleFollow(servers[0], servers[1]) + }) + + it('Should upload a video and transcode it to HLS', async function () { + this.timeout(120000) + + { + const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, { name: 'video 1', fixture: 'video_short.webm' }) + videoUUID = res.body.video.uuid + } + + await waitJobs(servers) + + await checkHlsPlaylist(servers, videoUUID) + }) + + it('Should update the video', async function () { + await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { name: 'video 1 updated' }) + + await waitJobs(servers) + + await checkHlsPlaylist(servers, videoUUID) + }) + + it('Should delete the video', async function () { + await removeVideo(servers[0].url, servers[0].accessToken, videoUUID) + + await waitJobs(servers) + + for (const server of servers) { + await getVideo(server.url, videoUUID, 404) + } + }) + + it('Should have the playlists/segment deleted from the disk', async function () { + for (const server of servers) { + await checkDirectoryIsEmpty(server, 'videos') + await checkDirectoryIsEmpty(server, join('playlists', 'hls')) + } + }) + + it('Should have an empty tmp directory', async function () { + for (const server of servers) { + await checkTmpIsEmpty(server) + } + }) + + after(async function () { + killallServers(servers) + + // Keep the logs if the test failed + if (this['ok']) { + await flushTests() + } + }) +}) diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts index 811ea6a9f..d38bb4331 100644 --- a/server/tests/cli/update-host.ts +++ b/server/tests/cli/update-host.ts @@ -86,6 +86,13 @@ describe('Test update host scripts', function () { const { body } = await makeActivityPubGetRequest(server.url, '/videos/watch/' + video.uuid) expect(body.id).to.equal('http://localhost:9002/videos/watch/' + video.uuid) + + const res = await getVideo(server.url, video.uuid) + const videoDetails: VideoDetails = res.body + + expect(videoDetails.trackerUrls[0]).to.include(server.host) + expect(videoDetails.streamingPlaylists[0].playlistUrl).to.include(server.host) + expect(videoDetails.streamingPlaylists[0].segmentsSha256Url).to.include(server.host) } }) @@ -100,7 +107,7 @@ describe('Test update host scripts', function () { } }) - it('Should have update accounts url', async function () { + it('Should have updated accounts url', async function () { const res = await getAccountsList(server.url) expect(res.body.total).to.equal(3) @@ -112,7 +119,7 @@ describe('Test update host scripts', function () { } }) - it('Should update torrent hosts', async function () { + it('Should have updated torrent hosts', async function () { this.timeout(30000) const res = await getVideosList(server.url) diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index 2874a2131..151c5a989 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts @@ -78,7 +78,11 @@ getSettings() password: program['password'] } - run(user, program['url']).catch(err => console.error(err)) + run(user, program['url']) + .catch(err => { + console.error(err) + process.exit(-1) + }) }) async function promptPassword () { @@ -112,8 +116,12 @@ async function run (user, url: string) { secret: res.body.client_secret } - const res2 = await login(url, client, user) - accessToken = res2.body.access_token + try { + const res = await login(program[ 'url' ], client, user) + accessToken = res.body.access_token + } catch (err) { + throw new Error('Cannot authenticate. Please check your username/password.') + } const youtubeDL = await safeGetYoutubeDL() @@ -216,6 +224,7 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, cwd: st nsfw: isNSFW(videoInfo), waitTranscoding: true, commentsEnabled: true, + downloadEnabled: true, description: videoInfo.description || undefined, support: undefined, tags, diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts index cc7bd9b4c..ebc62c965 100644 --- a/server/tools/peertube-upload.ts +++ b/server/tools/peertube-upload.ts @@ -30,6 +30,7 @@ if (!program['tags']) program['tags'] = [] if (!program['nsfw']) program['nsfw'] = false if (!program['privacy']) program['privacy'] = VideoPrivacy.PUBLIC if (!program['commentsEnabled']) program['commentsEnabled'] = false +if (!program['downloadEnabled']) program['downloadEnabled'] = true getSettings() .then(settings => { @@ -116,6 +117,7 @@ async function run () { description: program['videoDescription'], tags: program['tags'], commentsEnabled: program['commentsEnabled'], + downloadEnabled: program['downloadEnabled'], fixture: program['file'], thumbnailfile: program['thumbnail'], previewfile: program['preview'], diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts index 44cb99efb..89994f665 100644 --- a/shared/models/activitypub/activity.ts +++ b/shared/models/activitypub/activity.ts @@ -5,12 +5,14 @@ import { DislikeObject } from './objects/dislike-object' import { VideoAbuseObject } from './objects/video-abuse-object' import { VideoCommentObject } from './objects/video-comment-object' import { ViewObject } from './objects/view-object' +import { APObject } from './objects/object.model' export type Activity = ActivityCreate | ActivityUpdate | ActivityDelete | ActivityFollow | ActivityAccept | ActivityAnnounce | - ActivityUndo | ActivityLike | ActivityReject + ActivityUndo | ActivityLike | ActivityReject | ActivityView | ActivityDislike | ActivityFlag -export type ActivityType = 'Create' | 'Update' | 'Delete' | 'Follow' | 'Accept' | 'Announce' | 'Undo' | 'Like' | 'Reject' +export type ActivityType = 'Create' | 'Update' | 'Delete' | 'Follow' | 'Accept' | 'Announce' | 'Undo' | 'Like' | 'Reject' | + 'View' | 'Dislike' | 'Flag' export interface ActivityAudience { to: string[] @@ -59,15 +61,34 @@ export interface ActivityReject extends BaseActivity { export interface ActivityAnnounce extends BaseActivity { type: 'Announce' - object: string | { id: string } + object: APObject } export interface ActivityUndo extends BaseActivity { type: 'Undo', - object: ActivityFollow | ActivityLike | ActivityCreate | ActivityAnnounce + object: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce } export interface ActivityLike extends BaseActivity { type: 'Like', - object: string + object: APObject +} + +export interface ActivityView extends BaseActivity { + type: 'View', + actor: string + object: APObject +} + +export interface ActivityDislike extends BaseActivity { + id: string + type: 'Dislike' + actor: string + object: APObject +} + +export interface ActivityFlag extends BaseActivity { + type: 'Flag', + content: string, + object: APObject } diff --git a/shared/models/activitypub/activitypub-ordered-collection.ts b/shared/models/activitypub/activitypub-ordered-collection.ts index dfec0bb76..3de0890bb 100644 --- a/shared/models/activitypub/activitypub-ordered-collection.ts +++ b/shared/models/activitypub/activitypub-ordered-collection.ts @@ -2,6 +2,9 @@ export interface ActivityPubOrderedCollection { '@context': string[] type: 'OrderedCollection' | 'OrderedCollectionPage' totalItems: number - partOf?: string orderedItems: T[] + + partOf?: string + next?: string + first?: string } diff --git a/shared/models/activitypub/objects/cache-file-object.ts b/shared/models/activitypub/objects/cache-file-object.ts index 0a5125f5b..4b0a3a724 100644 --- a/shared/models/activitypub/objects/cache-file-object.ts +++ b/shared/models/activitypub/objects/cache-file-object.ts @@ -1,9 +1,9 @@ -import { ActivityVideoUrlObject } from './common-objects' +import { ActivityVideoUrlObject, ActivityPlaylistUrlObject } from './common-objects' export interface CacheFileObject { id: string type: 'CacheFile', object: string expires: string - url: ActivityVideoUrlObject + url: ActivityVideoUrlObject | ActivityPlaylistUrlObject } diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index 118a4f43d..8c89810d6 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts @@ -28,25 +28,47 @@ export type ActivityVideoUrlObject = { fps: number } -export type ActivityUrlObject = - ActivityVideoUrlObject - | - { - type: 'Link' - // TODO: remove mimeType (backward compatibility, introduced in v1.1.0) - mimeType?: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' - mediaType: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' - href: string - height: number - } - | - { - type: 'Link' - // TODO: remove mimeType (backward compatibility, introduced in v1.1.0) - mimeType?: 'text/html' - mediaType: 'text/html' - href: string - } +export type ActivityPlaylistSegmentHashesObject = { + type: 'Link' + name: 'sha256' + // TODO: remove mimeType (backward compatibility, introduced in v1.1.0) + mimeType?: 'application/json' + mediaType: 'application/json' + href: string +} + +export type ActivityPlaylistInfohashesObject = { + type: 'Infohash' + name: string +} + +export type ActivityPlaylistUrlObject = { + type: 'Link' + // TODO: remove mimeType (backward compatibility, introduced in v1.1.0) + mimeType?: 'application/x-mpegURL' + mediaType: 'application/x-mpegURL' + href: string + tag?: (ActivityPlaylistSegmentHashesObject | ActivityPlaylistInfohashesObject)[] +} + +export type ActivityBitTorrentUrlObject = { + type: 'Link' + // TODO: remove mimeType (backward compatibility, introduced in v1.1.0) + mimeType?: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' + mediaType: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' + href: string + height: number +} + +export type ActivityHtmlUrlObject = { + type: 'Link' + // TODO: remove mimeType (backward compatibility, introduced in v1.1.0) + mimeType?: 'text/html' + mediaType: 'text/html' + href: string +} + +export type ActivityUrlObject = ActivityVideoUrlObject | ActivityPlaylistUrlObject | ActivityBitTorrentUrlObject | ActivityHtmlUrlObject export interface ActivityPubAttributedTo { type: 'Group' | 'Person' diff --git a/shared/models/activitypub/objects/object.model.ts b/shared/models/activitypub/objects/object.model.ts new file mode 100644 index 000000000..3fd33800a --- /dev/null +++ b/shared/models/activitypub/objects/object.model.ts @@ -0,0 +1 @@ +export type APObject = string | { id: string } diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts index df07507b4..239822bc4 100644 --- a/shared/models/activitypub/objects/video-torrent-object.ts +++ b/shared/models/activitypub/objects/video-torrent-object.ts @@ -20,7 +20,8 @@ export interface VideoTorrentObject { subtitleLanguage: ActivityIdentifierObject[] views: number sensitive: boolean - commentsEnabled: boolean + commentsEnabled: boolean, + downloadEnabled: boolean, waitTranscoding: boolean state: VideoState published: string diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts index 6b3b1b47c..a3953874d 100644 --- a/shared/models/actors/actor.model.ts +++ b/shared/models/actors/actor.model.ts @@ -10,5 +10,5 @@ export interface Actor { followersCount: number createdAt: Date | string updatedAt: Date | string - avatar: Avatar + avatar?: Avatar } diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index 7a3eaa33f..b42ff90c6 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts @@ -61,6 +61,9 @@ export interface CustomConfig { '720p': boolean '1080p': boolean } + hls: { + enabled: boolean + } } import: { diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 7031009d9..baafed31f 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts @@ -25,11 +25,15 @@ export interface ServerConfig { signup: { allowed: boolean, - allowedForCurrentIP: boolean, + allowedForCurrentIP: boolean requiresEmailVerification: boolean } transcoding: { + hls: { + enabled: boolean + } + enabledResolutions: number[] } @@ -48,7 +52,7 @@ export interface ServerConfig { file: { size: { max: number - }, + } extensions: string[] } } @@ -78,4 +82,10 @@ export interface ServerConfig { videoQuota: number videoQuotaDaily: number } + + trending: { + videos: { + intervalDays: number + } + } } diff --git a/shared/models/server/server-stats.model.ts b/shared/models/server/server-stats.model.ts index a6bd2d4d3..74f3de5d3 100644 --- a/shared/models/server/server-stats.model.ts +++ b/shared/models/server/server-stats.model.ts @@ -5,6 +5,7 @@ export interface ServerStats { totalLocalVideos: number totalLocalVideoViews: number totalLocalVideoComments: number + totalLocalVideoFilesSize: number totalVideos: number totalVideoComments: number diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts index f41b6f534..186b62612 100644 --- a/shared/models/users/user-notification.model.ts +++ b/shared/models/users/user-notification.model.ts @@ -22,16 +22,23 @@ export interface VideoInfo { name: string } +export interface ActorInfo { + id: number + displayName: string + name: string + host: string + avatar?: { + path: string + } +} + export interface UserNotification { id: number type: UserNotificationType read: boolean video?: VideoInfo & { - channel: { - id: number - displayName: string - } + channel: ActorInfo } videoImport?: { @@ -45,10 +52,7 @@ export interface UserNotification { comment?: { id: number threadId: number - account: { - id: number - displayName: string - } + account: ActorInfo video: VideoInfo } @@ -62,18 +66,11 @@ export interface UserNotification { video: VideoInfo } - account?: { - id: number - displayName: string - name: string - } + account?: ActorInfo actorFollow?: { id: number - follower: { - name: string - displayName: string - } + follower: ActorInfo following: { type: 'account' | 'channel' name: string diff --git a/shared/models/users/user-update.model.ts b/shared/models/users/user-update.model.ts index abde51321..cd215bab3 100644 --- a/shared/models/users/user-update.model.ts +++ b/shared/models/users/user-update.model.ts @@ -1,6 +1,7 @@ import { UserRole } from './user-role' export interface UserUpdate { + password?: string email?: string emailVerified?: boolean videoQuota?: number diff --git a/shared/models/videos/blacklist/video-blacklist-create.model.ts b/shared/models/videos/blacklist/video-blacklist-create.model.ts index 89c69cb56..6e7d36421 100644 --- a/shared/models/videos/blacklist/video-blacklist-create.model.ts +++ b/shared/models/videos/blacklist/video-blacklist-create.model.ts @@ -1,3 +1,4 @@ export interface VideoBlacklistCreate { reason?: string + unfederate?: boolean } diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts index ef4e5e3a2..4bd976190 100644 --- a/shared/models/videos/blacklist/video-blacklist.model.ts +++ b/shared/models/videos/blacklist/video-blacklist.model.ts @@ -2,6 +2,7 @@ export interface VideoBlacklist { id: number createdAt: Date updatedAt: Date + unfederated: boolean reason?: string video: { diff --git a/shared/models/videos/video-create.model.ts b/shared/models/videos/video-create.model.ts index 392bd1025..53631bf79 100644 --- a/shared/models/videos/video-create.model.ts +++ b/shared/models/videos/video-create.model.ts @@ -13,6 +13,7 @@ export interface VideoCreate { name: string tags?: string[] commentsEnabled?: boolean + downloadEnabled?: boolean privacy: VideoPrivacy scheduleUpdate?: VideoScheduleUpdate originallyPublishedAt: Date | string diff --git a/shared/models/videos/video-streaming-playlist.model.ts b/shared/models/videos/video-streaming-playlist.model.ts new file mode 100644 index 000000000..17f8fe865 --- /dev/null +++ b/shared/models/videos/video-streaming-playlist.model.ts @@ -0,0 +1,12 @@ +import { VideoStreamingPlaylistType } from './video-streaming-playlist.type' + +export class VideoStreamingPlaylist { + id: number + type: VideoStreamingPlaylistType + playlistUrl: string + segmentsSha256Url: string + + redundancies: { + baseUrl: string + }[] +} diff --git a/shared/models/videos/video-streaming-playlist.type.ts b/shared/models/videos/video-streaming-playlist.type.ts new file mode 100644 index 000000000..3b403f295 --- /dev/null +++ b/shared/models/videos/video-streaming-playlist.type.ts @@ -0,0 +1,3 @@ +export enum VideoStreamingPlaylistType { + HLS = 1 +} diff --git a/shared/models/videos/video-update.model.ts b/shared/models/videos/video-update.model.ts index 62e02e079..4ef904156 100644 --- a/shared/models/videos/video-update.model.ts +++ b/shared/models/videos/video-update.model.ts @@ -11,6 +11,7 @@ export interface VideoUpdate { privacy?: VideoPrivacy tags?: string[] commentsEnabled?: boolean + downloadEnabled?: boolean nsfw?: boolean waitTranscoding?: boolean channelId?: number diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 2373ceb18..df800461c 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts @@ -5,6 +5,7 @@ import { VideoChannel } from './channel/video-channel.model' import { VideoPrivacy } from './video-privacy.enum' import { VideoScheduleUpdate } from './video-schedule-update.model' import { VideoConstant } from './video-constant.model' +import { VideoStreamingPlaylist } from './video-streaming-playlist.model' export interface VideoFile { magnetUri: string @@ -24,7 +25,7 @@ export interface VideoChannelAttribute { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } export interface AccountAttribute { @@ -34,7 +35,7 @@ export interface AccountAttribute { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } export interface Video { @@ -83,8 +84,13 @@ export interface VideoDetails extends Video { files: VideoFile[] account: Account commentsEnabled: boolean + downloadEnabled: boolean // Not optional in details (unlike in Video) waitTranscoding: boolean state: VideoConstant + + trackerUrls: string[] + + streamingPlaylists: VideoStreamingPlaylist[] } diff --git a/shared/utils/index.ts b/shared/utils/index.ts index e08bbfd2a..156901372 100644 --- a/shared/utils/index.ts +++ b/shared/utils/index.ts @@ -17,6 +17,8 @@ export * from './users/users' export * from './videos/video-abuses' export * from './videos/video-blacklist' export * from './videos/video-channels' +export * from './videos/video-comments' +export * from './videos/video-playlists' export * from './videos/videos' export * from './videos/video-change-ownership' export * from './feeds/feeds' diff --git a/shared/utils/requests/requests.ts b/shared/utils/requests/requests.ts index 77e9f6164..6b59e24fc 100644 --- a/shared/utils/requests/requests.ts +++ b/shared/utils/requests/requests.ts @@ -1,24 +1,32 @@ import * as request from 'supertest' import { buildAbsoluteFixturePath, root } from '../miscs/miscs' import { isAbsolute, join } from 'path' +import { parse } from 'url' + +function makeRawRequest (url: string, statusCodeExpected?: number, range?: string) { + const { host, protocol, pathname } = parse(url) + + return makeGetRequest({ url: `${protocol}//${host}`, path: pathname, statusCodeExpected, range }) +} function makeGetRequest (options: { url: string, - path: string, + path?: string, query?: any, token?: string, statusCodeExpected?: number, - contentType?: string + contentType?: string, + range?: string }) { if (!options.statusCodeExpected) options.statusCodeExpected = 400 if (options.contentType === undefined) options.contentType = 'application/json' - const req = request(options.url) - .get(options.path) + const req = request(options.url).get(options.path) if (options.contentType) req.set('Accept', options.contentType) if (options.token) req.set('Authorization', 'Bearer ' + options.token) if (options.query) req.query(options.query) + if (options.range) req.set('Range', options.range) return req.expect(options.statusCodeExpected) } @@ -164,5 +172,6 @@ export { makePostBodyRequest, makePutBodyRequest, makeDeleteRequest, + makeRawRequest, updateAvatarRequest } diff --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts index 0c5512bab..29c24cff9 100644 --- a/shared/utils/server/config.ts +++ b/shared/utils/server/config.ts @@ -97,6 +97,9 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) { '480p': true, '720p': false, '1080p': false + }, + hls: { + enabled: false } }, import: { diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts index 568385a41..bde7dd5c2 100644 --- a/shared/utils/server/servers.ts +++ b/shared/utils/server/servers.ts @@ -145,8 +145,16 @@ function runServer (serverNumber: number, configOverride?: Object, args = []) { if (dontContinue === true) return server.app.stdout.removeListener('data', onStdout) + + process.on('exit', () => { + try { + process.kill(server.app.pid) + } catch { /* empty */ } + }) + res(server) }) + }) } @@ -158,9 +166,13 @@ async function reRunServer (server: ServerInfo, configOverride?: any) { } async function checkTmpIsEmpty (server: ServerInfo) { + return checkDirectoryIsEmpty(server, 'tmp') +} + +async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) { const testDirectory = 'test' + server.serverNumber - const directoryPath = join(root(), testDirectory, 'tmp') + const directoryPath = join(root(), testDirectory, directory) const directoryExists = existsSync(directoryPath) expect(directoryExists).to.be.true @@ -191,6 +203,7 @@ async function waitUntilLog (server: ServerInfo, str: string, count = 1) { // --------------------------------------------------------------------------- export { + checkDirectoryIsEmpty, checkTmpIsEmpty, ServerInfo, flushAndRunMultipleServers, diff --git a/shared/utils/users/user-notifications.ts b/shared/utils/users/user-notifications.ts index bcbe29fc7..c8ed7df30 100644 --- a/shared/utils/users/user-notifications.ts +++ b/shared/utils/users/user-notifications.ts @@ -146,6 +146,7 @@ function checkVideo (video: any, videoName?: string, videoUUID?: string) { function checkActor (actor: any) { expect(actor.displayName).to.be.a('string') expect(actor.displayName).to.not.be.empty + expect(actor.host).to.not.be.undefined } function checkComment (comment: any, commentId: number, threadId: number) { @@ -273,8 +274,8 @@ async function checkNewActorFollow ( checkActor(notification.actorFollow.follower) expect(notification.actorFollow.follower.displayName).to.equal(followerDisplayName) expect(notification.actorFollow.follower.name).to.equal(followerName) + expect(notification.actorFollow.follower.host).to.not.be.undefined - checkActor(notification.actorFollow.following) expect(notification.actorFollow.following.displayName).to.equal(followingDisplayName) expect(notification.actorFollow.following.type).to.equal(followType) } else { diff --git a/shared/utils/users/users.ts b/shared/utils/users/users.ts index 61a7e3757..7191b263e 100644 --- a/shared/utils/users/users.ts +++ b/shared/utils/users/users.ts @@ -213,11 +213,13 @@ function updateUser (options: { emailVerified?: boolean, videoQuota?: number, videoQuotaDaily?: number, + password?: string, role?: UserRole }) { const path = '/api/v1/users/' + options.userId const toSend = {} + if (options.password !== undefined && options.password !== null) toSend['password'] = options.password if (options.email !== undefined && options.email !== null) toSend['email'] = options.email if (options.emailVerified !== undefined && options.emailVerified !== null) toSend['emailVerified'] = options.emailVerified if (options.videoQuota !== undefined && options.videoQuota !== null) toSend['videoQuota'] = options.videoQuota diff --git a/shared/utils/videos/video-blacklist.ts b/shared/utils/videos/video-blacklist.ts index 2c176fde0..f2ae0ed26 100644 --- a/shared/utils/videos/video-blacklist.ts +++ b/shared/utils/videos/video-blacklist.ts @@ -1,11 +1,18 @@ import * as request from 'supertest' -function addVideoToBlacklist (url: string, token: string, videoId: number | string, reason?: string, specialStatus = 204) { +function addVideoToBlacklist ( + url: string, + token: string, + videoId: number | string, + reason?: string, + unfederate?: boolean, + specialStatus = 204 +) { const path = '/api/v1/videos/' + videoId + '/blacklist' return request(url) .post(path) - .send({ reason }) + .send({ reason, unfederate }) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + token) .expect(specialStatus) diff --git a/shared/utils/videos/video-playlists.ts b/shared/utils/videos/video-playlists.ts new file mode 100644 index 000000000..eb25011cb --- /dev/null +++ b/shared/utils/videos/video-playlists.ts @@ -0,0 +1,51 @@ +import { makeRawRequest } from '../requests/requests' +import { sha256 } from '../../../server/helpers/core-utils' +import { VideoStreamingPlaylist } from '../../models/videos/video-streaming-playlist.model' +import { expect } from 'chai' + +function getPlaylist (url: string, statusCodeExpected = 200) { + return makeRawRequest(url, statusCodeExpected) +} + +function getSegment (url: string, statusCodeExpected = 200, range?: string) { + return makeRawRequest(url, statusCodeExpected, range) +} + +function getSegmentSha256 (url: string, statusCodeExpected = 200) { + return makeRawRequest(url, statusCodeExpected) +} + +async function checkSegmentHash ( + baseUrlPlaylist: string, + baseUrlSegment: string, + videoUUID: string, + resolution: number, + hlsPlaylist: VideoStreamingPlaylist +) { + const res = await getPlaylist(`${baseUrlPlaylist}/${videoUUID}/${resolution}.m3u8`) + const playlist = res.text + + const videoName = `${videoUUID}-${resolution}-fragmented.mp4` + + const matches = /#EXT-X-BYTERANGE:(\d+)@(\d+)/.exec(playlist) + + const length = parseInt(matches[1], 10) + const offset = parseInt(matches[2], 10) + const range = `${offset}-${offset + length - 1}` + + const res2 = await getSegment(`${baseUrlSegment}/${videoUUID}/${videoName}`, 206, `bytes=${range}`) + + const resSha = await getSegmentSha256(hlsPlaylist.segmentsSha256Url) + + const sha256Server = resSha.body[ videoName ][range] + expect(sha256(res2.body)).to.equal(sha256Server) +} + +// --------------------------------------------------------------------------- + +export { + getPlaylist, + getSegment, + getSegmentSha256, + checkSegmentHash +} diff --git a/shared/utils/videos/videos.ts b/shared/utils/videos/videos.ts index 0cf6e7c4f..39c808d1f 100644 --- a/shared/utils/videos/videos.ts +++ b/shared/utils/videos/videos.ts @@ -28,6 +28,7 @@ type VideoAttributes = { language?: string nsfw?: boolean commentsEnabled?: boolean + downloadEnabled?: boolean waitTranscoding?: boolean description?: string tags?: string[] @@ -271,7 +272,16 @@ function removeVideo (url: string, token: string, id: number | string, expectedS async function checkVideoFilesWereRemoved ( videoUUID: string, serverNumber: number, - directories = [ 'redundancy', 'videos', 'thumbnails', 'torrents', 'previews', 'captions' ] + directories = [ + 'redundancy', + 'videos', + 'thumbnails', + 'torrents', + 'previews', + 'captions', + join('playlists', 'hls'), + join('redundancy', 'hls') + ] ) { const testDirectory = 'test' + serverNumber @@ -279,7 +289,7 @@ async function checkVideoFilesWereRemoved ( const directoryPath = join(root(), testDirectory, directory) const directoryExists = existsSync(directoryPath) - expect(directoryExists).to.be.true + if (!directoryExists) continue const files = await readdir(directoryPath) for (const file of files) { @@ -311,6 +321,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg tags: [ 'tag' ], privacy: VideoPrivacy.PUBLIC, commentsEnabled: true, + downloadEnabled: true, fixture: 'video_short.webm' }, videoAttributesArg) @@ -321,6 +332,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg .field('name', attributes.name) .field('nsfw', JSON.stringify(attributes.nsfw)) .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) + .field('downloadEnabled', JSON.stringify(attributes.downloadEnabled)) .field('waitTranscoding', JSON.stringify(attributes.waitTranscoding)) .field('privacy', attributes.privacy.toString()) .field('channelId', attributes.channelId) @@ -371,6 +383,7 @@ function updateVideo (url: string, accessToken: string, id: number | string, att if (attributes.language) body['language'] = attributes.language if (attributes.nsfw !== undefined) body['nsfw'] = JSON.stringify(attributes.nsfw) if (attributes.commentsEnabled !== undefined) body['commentsEnabled'] = JSON.stringify(attributes.commentsEnabled) + if (attributes.downloadEnabled !== undefined) body['downloadEnabled'] = JSON.stringify(attributes.downloadEnabled) if (attributes.description) body['description'] = attributes.description if (attributes.tags) body['tags'] = attributes.tags if (attributes.privacy) body['privacy'] = attributes.privacy @@ -436,6 +449,7 @@ async function completeVideoCheck ( language: string nsfw: boolean commentsEnabled: boolean + downloadEnabled: boolean description: string publishedAt?: string support: string @@ -510,6 +524,7 @@ async function completeVideoCheck ( expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) + expect(videoDetails.downloadEnabled).to.equal(attributes.downloadEnabled) for (const attributeFile of attributes.files) { const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution) diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 535dfdd4c..f2bb945f9 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: PeerTube - version: 1.1.0 + version: 1.2.0 contact: name: PeerTube Community url: 'https://joinpeertube.org' diff --git a/support/doc/tools.md b/support/doc/tools.md index 4f806a9db..1a9ba7d2b 100644 --- a/support/doc/tools.md +++ b/support/doc/tools.md @@ -59,7 +59,8 @@ $ npm run build:server ### CLI wrapper -The wrapper provides a convenient interface to the following scripts. You can access it as `peertube` via an alias in your `.bashrc` like `alias peertube="node /your/peertube/directory/dist/server/tools/peertube.js"`: +The wrapper provides a convenient interface to the following scripts. +You can access it as `peertube` via an alias in your `.bashrc` like `alias peertube="cd /your/peertube/directory/ && node ./dist/server/tools/peertube.js"` (you have to keep the `cd` command): ``` Usage: peertube [command] [options] diff --git a/support/docker/production/docker-entrypoint.sh b/support/docker/production/docker-entrypoint.sh index 6dbbfddf6..7dd626b9f 100755 --- a/support/docker/production/docker-entrypoint.sh +++ b/support/docker/production/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # Always copy default and custom env configuration file, in cases where new keys were added cp /app/config/default.yaml /config cp /app/support/docker/production/config/custom-environment-variables.yaml /config -chown -R peertube:peertube /config +find /config ! -user peertube -exec chown peertube:peertube {} \; # first arg is `-f` or `--some-option` # or first arg is `something.conf` @@ -19,7 +19,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then - chown -R peertube:peertube /data + find /data ! -user peertube -exec chown peertube:peertube {} \; exec gosu peertube "$0" "$@" fi diff --git a/support/nginx/peertube b/support/nginx/peertube index 914ca3741..fee0f5d1c 100644 --- a/support/nginx/peertube +++ b/support/nginx/peertube @@ -41,7 +41,7 @@ server { # It might be nice to compress JSON, but leaving that out to protect against potential # compression+encryption information leak attacks like BREACH. gzip on; - gzip_types text/css text/html application/javascript; + gzip_types text/css application/javascript; gzip_vary on; # Enable HSTS @@ -158,4 +158,16 @@ server { proxy_set_header Host $host; proxy_pass http://localhost:9000; } + + location /socket.io { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + + proxy_pass http://localhost:9000; + + # enable WebSockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } }