aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+signup/+register/register.component.html2
-rw-r--r--client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts2
-rw-r--r--client/src/app/shared/shared-forms/input-toggle-hidden.component.scss2
-rw-r--r--client/src/assets/player/shared/settings/settings-menu-item.ts2
-rw-r--r--client/src/sass/application.scss2
-rw-r--r--server/helpers/image-utils.ts2
-rw-r--r--server/initializers/constants.ts2
-rw-r--r--server/lib/activitypub/process/process-create.ts2
-rw-r--r--server/lib/emailer.ts2
-rw-r--r--server/lib/redis.ts2
-rw-r--r--server/lib/signup.ts2
-rw-r--r--server/middlewares/validators/users.ts2
-rw-r--r--server/models/abuse/abuse-query-builder.ts2
-rw-r--r--server/models/shared/abstract-run-query.ts2
-rw-r--r--server/models/utils.ts2
-rw-r--r--server/tests/api/check-params/abuses.ts4
-rw-r--r--server/tests/api/notifications/user-notifications.ts2
-rw-r--r--server/tests/api/server/contact-form.ts2
-rw-r--r--shared/models/plugins/client/client-hook.model.ts10
-rw-r--r--support/doc/api/openapi.yaml12
-rw-r--r--support/doc/dependencies.md2
-rw-r--r--support/openapi/kotlin/README.mustache2
22 files changed, 32 insertions, 32 deletions
diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html
index 2d0e6e865..5c4fe5f0b 100644
--- a/client/src/app/+signup/+register/register.component.html
+++ b/client/src/app/+signup/+register/register.component.html
@@ -32,7 +32,7 @@
32 <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button> 32 <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button>
33 </cdk-step> 33 </cdk-step>
34 34
35 <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user informations" label="User"> 35 <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user information" label="User">
36 <my-register-step-user (formBuilt)="onUserFormBuilt($event)" [videoUploadDisabled]="videoUploadDisabled"></my-register-step-user> 36 <my-register-step-user (formBuilt)="onUserFormBuilt($event)" [videoUploadDisabled]="videoUploadDisabled"></my-register-step-user>
37 37
38 <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button> 38 <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
index 0e4d5fb12..7d3498d4c 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
@@ -7,7 +7,7 @@ import { MiniatureDisplayOptions } from '../../shared-video-miniature'
7import { CustomMarkupComponent } from './shared' 7import { CustomMarkupComponent } from './shared'
8 8
9/* 9/*
10 * Markup component list videos depending on criterias 10 * Markup component list videos depending on criteria
11*/ 11*/
12 12
13@Component({ 13@Component({
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss b/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
index ef4236ebc..b5a71eddd 100644
--- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
+++ b/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
@@ -6,7 +6,7 @@ input {
6 @include padding-left(15px !important); 6 @include padding-left(15px !important);
7 @include padding-right(15px !important); 7 @include padding-right(15px !important);
8 8
9 // set again properties of peertube-input-text that are overriden by .input-group 9 // set again properties of peertube-input-text that are overridden by .input-group
10 font-size: 15px !important; 10 font-size: 15px !important;
11} 11}
12 12
diff --git a/client/src/assets/player/shared/settings/settings-menu-item.ts b/client/src/assets/player/shared/settings/settings-menu-item.ts
index 8d1819a2d..07ff0f2a8 100644
--- a/client/src/assets/player/shared/settings/settings-menu-item.ts
+++ b/client/src/assets/player/shared/settings/settings-menu-item.ts
@@ -301,7 +301,7 @@ class SettingsMenuItem extends MenuItem {
301 this.settingsSubMenuValueEl_.innerHTML = html 301 this.settingsSubMenuValueEl_.innerHTML = html
302 }, 250) 302 }, 250)
303 } else { 303 } else {
304 // Loop trough the submenu items to find the selected child 304 // Loop through the submenu items to find the selected child
305 for (const subMenuItem of this.subMenu.menu.children_) { 305 for (const subMenuItem of this.subMenu.menu.children_) {
306 if (!(subMenuItem instanceof component)) { 306 if (!(subMenuItem instanceof component)) {
307 continue 307 continue
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 84b575eb3..99566acb6 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -342,7 +342,7 @@ table {
342 --videosHorizontalMarginContent: #{pvar(--horizontalMarginContent)}; 342 --videosHorizontalMarginContent: #{pvar(--horizontalMarginContent)};
343 } 343 }
344 344
345 /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */ 345 /* the following applies from 500px to 900px and is partially overridden from 500px to 800px by changes below to $small-view */
346 .main-col, 346 .main-col,
347 .main-col.expanded { 347 .main-col.expanded {
348 --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 3)}; 348 --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 3)};
diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index 7d6451db9..ebb102a0d 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -114,7 +114,7 @@ async function autoResize (options: {
114}) { 114}) {
115 const { sourceImage, newSize, destination } = options 115 const { sourceImage, newSize, destination } = options
116 116
117 // Portrait mode targetting a landscape, apply some effect on the image 117 // Portrait mode targeting a landscape, apply some effect on the image
118 const sourceIsPortrait = sourceImage.getWidth() < sourceImage.getHeight() 118 const sourceIsPortrait = sourceImage.getWidth() < sourceImage.getHeight()
119 const destIsPortraitOrSquare = newSize.width <= newSize.height 119 const destIsPortraitOrSquare = newSize.width <= newSize.height
120 120
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 824a30bd2..2d324d1eb 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -210,7 +210,7 @@ const CRAWL_REQUEST_CONCURRENCY = 1 // How many requests in parallel to fetch re
210 210
211const AP_CLEANER = { 211const AP_CLEANER = {
212 CONCURRENCY: 10, // How many requests in parallel we do in activitypub-cleaner job 212 CONCURRENCY: 10, // How many requests in parallel we do in activitypub-cleaner job
213 UNAVAILABLE_TRESHOLD: 3, // How many attemps we do before removing an unavailable remote resource 213 UNAVAILABLE_TRESHOLD: 3, // How many attempts we do before removing an unavailable remote resource
214 PERIOD: parseDurationToMs('1 week') // /!\ Has to be sync with REPEAT_JOBS 214 PERIOD: parseDurationToMs('1 week') // /!\ Has to be sync with REPEAT_JOBS
215} 215}
216 216
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index 3e7931bb2..76ed37aae 100644
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -124,7 +124,7 @@ async function processCreateVideoComment (activity: ActivityCreate, byActor: MAc
124 return 124 return
125 } 125 }
126 126
127 // Try to not forward unwanted commments on our videos 127 // Try to not forward unwanted comments on our videos
128 if (video.isOwned()) { 128 if (video.isOwned()) {
129 if (await isBlockedByServerOrAccount(comment.Account, video.VideoChannel.Account)) { 129 if (await isBlockedByServerOrAccount(comment.Account, video.VideoChannel.Account)) {
130 logger.info('Skip comment forward from blocked account or server %s.', comment.Account.Actor.url) 130 logger.info('Skip comment forward from blocked account or server %s.', comment.Account.Actor.url)
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index aebca04fe..edc99057c 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -179,7 +179,7 @@ class Emailer {
179 } 179 }
180 } 180 }
181 181
182 // overriden/new variables given for a specific template in the payload 182 // overridden/new variables given for a specific template in the payload
183 const sendOptions = merge(baseOptions, options) 183 const sendOptions = merge(baseOptions, options)
184 184
185 await email.send(sendOptions) 185 await email.send(sendOptions)
diff --git a/server/lib/redis.ts b/server/lib/redis.ts
index d052de786..158f3c080 100644
--- a/server/lib/redis.ts
+++ b/server/lib/redis.ts
@@ -308,7 +308,7 @@ class Redis {
308 return this.deleteKey('resumable-upload-' + uploadId) 308 return this.deleteKey('resumable-upload-' + uploadId)
309 } 309 }
310 310
311 /* ************ AP ressource unavailability ************ */ 311 /* ************ AP resource unavailability ************ */
312 312
313 async addAPUnavailability (url: string) { 313 async addAPUnavailability (url: string) {
314 const key = this.generateAPUnavailabilityKey(url) 314 const key = this.generateAPUnavailabilityKey(url)
diff --git a/server/lib/signup.ts b/server/lib/signup.ts
index 3c1397a12..f094531eb 100644
--- a/server/lib/signup.ts
+++ b/server/lib/signup.ts
@@ -26,7 +26,7 @@ function isSignupAllowedForCurrentIP (ip: string) {
26 const excludeList = [ 'blacklist' ] 26 const excludeList = [ 'blacklist' ]
27 let matched = '' 27 let matched = ''
28 28
29 // if there is a valid, non-empty whitelist, we exclude all unknown adresses too 29 // if there is a valid, non-empty whitelist, we exclude all unknown addresses too
30 if (CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr(cidr)).length > 0) { 30 if (CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr(cidr)).length > 0) {
31 excludeList.push('unknown') 31 excludeList.push('unknown')
32 } 32 }
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index bc6007c6d..6d306121e 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -486,7 +486,7 @@ const ensureAuthUserOwnsAccountValidator = [
486 if (res.locals.account.id !== user.Account.id) { 486 if (res.locals.account.id !== user.Account.id) {
487 return res.fail({ 487 return res.fail({
488 status: HttpStatusCode.FORBIDDEN_403, 488 status: HttpStatusCode.FORBIDDEN_403,
489 message: 'Only owner of this account can access this ressource.' 489 message: 'Only owner of this account can access this resource.'
490 }) 490 })
491 } 491 }
492 492
diff --git a/server/models/abuse/abuse-query-builder.ts b/server/models/abuse/abuse-query-builder.ts
index 025e6ba55..cfc924ba4 100644
--- a/server/models/abuse/abuse-query-builder.ts
+++ b/server/models/abuse/abuse-query-builder.ts
@@ -13,7 +13,7 @@ export type BuildAbusesQueryOptions = {
13 searchReporter?: string 13 searchReporter?: string
14 searchReportee?: string 14 searchReportee?: string
15 15
16 // video releated 16 // video related
17 searchVideo?: string 17 searchVideo?: string
18 searchVideoChannel?: string 18 searchVideoChannel?: string
19 videoIs?: AbuseVideoIs 19 videoIs?: AbuseVideoIs
diff --git a/server/models/shared/abstract-run-query.ts b/server/models/shared/abstract-run-query.ts
index f1182c7be..7f27a0c4b 100644
--- a/server/models/shared/abstract-run-query.ts
+++ b/server/models/shared/abstract-run-query.ts
@@ -2,7 +2,7 @@ import { QueryTypes, Sequelize, Transaction } from 'sequelize'
2 2
3/** 3/**
4 * 4 *
5 * Abstact builder to run video SQL queries 5 * Abstract builder to run video SQL queries
6 * 6 *
7 */ 7 */
8 8
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 88e31f22e..c468f748d 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -119,7 +119,7 @@ function getInstanceFollowsSort (value: string, lastSort: OrderItem = [ 'id', 'A
119 119
120function isOutdated (model: { createdAt: Date, updatedAt: Date }, refreshInterval: number) { 120function isOutdated (model: { createdAt: Date, updatedAt: Date }, refreshInterval: number) {
121 if (!model.createdAt || !model.updatedAt) { 121 if (!model.createdAt || !model.updatedAt) {
122 throw new Error('Miss createdAt & updatedAt attribuets to model') 122 throw new Error('Miss createdAt & updatedAt attributes to model')
123 } 123 }
124 124
125 const now = Date.now() 125 const now = Date.now()
diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts
index c4b051723..bc2cc640f 100644
--- a/server/tests/api/check-params/abuses.ts
+++ b/server/tests/api/check-params/abuses.ts
@@ -269,7 +269,7 @@ describe('Test abuses API validators', function () {
269 await makePostBodyRequest({ url: server.url, path, token: userToken, fields }) 269 await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
270 }) 270 })
271 271
272 it('Should succeed with the corret parameters (advanced)', async function () { 272 it('Should succeed with the correct parameters (advanced)', async function () {
273 const fields: AbuseCreate = { 273 const fields: AbuseCreate = {
274 video: { 274 video: {
275 id: server.store.videoCreated.id, 275 id: server.store.videoCreated.id,
@@ -333,7 +333,7 @@ describe('Test abuses API validators', function () {
333 await command.addMessage({ token: userToken, abuseId, message: 'a'.repeat(5000), expectedStatus: HttpStatusCode.BAD_REQUEST_400 }) 333 await command.addMessage({ token: userToken, abuseId, message: 'a'.repeat(5000), expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
334 }) 334 })
335 335
336 it('Should suceed with the correct params', async function () { 336 it('Should succeed with the correct params', async function () {
337 const res = await command.addMessage({ token: userToken, abuseId, message }) 337 const res = await command.addMessage({ token: userToken, abuseId, message })
338 messageId = res.body.abuseMessage.id 338 messageId = res.body.abuseMessage.id
339 }) 339 })
diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts
index a7cc529f8..a11289236 100644
--- a/server/tests/api/notifications/user-notifications.ts
+++ b/server/tests/api/notifications/user-notifications.ts
@@ -545,7 +545,7 @@ describe('Test user notifications', function () {
545 await servers[1].subscriptions.remove({ uri: 'user_1_channel@localhost:' + servers[0].port }) 545 await servers[1].subscriptions.remove({ uri: 'user_1_channel@localhost:' + servers[0].port })
546 }) 546 })
547 547
548 // PeerTube does not support accout -> account follows 548 // PeerTube does not support account -> account follows
549 // it('Should notify when a local account is following one of our channel', async function () { 549 // it('Should notify when a local account is following one of our channel', async function () {
550 // this.timeout(50000) 550 // this.timeout(50000)
551 // 551 //
diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts
index 4f01f6fd5..d6165b293 100644
--- a/server/tests/api/server/contact-form.ts
+++ b/server/tests/api/server/contact-form.ts
@@ -61,7 +61,7 @@ describe('Test contact form', function () {
61 expect(email['text']).contains('my super message') 61 expect(email['text']).contains('my super message')
62 }) 62 })
63 63
64 it('Should not have duplicated email adress in text message', async function () { 64 it('Should not have duplicated email address in text message', async function () {
65 const text = emails[0]['text'] as string 65 const text = emails[0]['text'] as string
66 66
67 const matches = text.match(/toto@example.com/g) 67 const matches = text.match(/toto@example.com/g)
diff --git a/shared/models/plugins/client/client-hook.model.ts b/shared/models/plugins/client/client-hook.model.ts
index bb55e92d5..04d42d591 100644
--- a/shared/models/plugins/client/client-hook.model.ts
+++ b/shared/models/plugins/client/client-hook.model.ts
@@ -108,16 +108,16 @@ export const clientActionHookObject = {
108 // Fired when the admin plugin settings page is being initialized 108 // Fired when the admin plugin settings page is being initialized
109 'action:admin-plugin-settings.init': true, 109 'action:admin-plugin-settings.init': true,
110 110
111 // Fired when the video upload page is being initalized 111 // Fired when the video upload page is being initialized
112 'action:video-upload.init': true, 112 'action:video-upload.init': true,
113 // Fired when the video import by URL page is being initalized 113 // Fired when the video import by URL page is being initialized
114 'action:video-url-import.init': true, 114 'action:video-url-import.init': true,
115 // Fired when the video import by torrent/magnet URI page is being initalized 115 // Fired when the video import by torrent/magnet URI page is being initialized
116 'action:video-torrent-import.init': true, 116 'action:video-torrent-import.init': true,
117 // Fired when the "Go Live" page is being initalized 117 // Fired when the "Go Live" page is being initialized
118 'action:go-live.init': true, 118 'action:go-live.init': true,
119 119
120 // Fired when the user explicitely logged in/logged out 120 // Fired when the user explicitly logged in/logged out
121 'action:auth-user.logged-in': true, 121 'action:auth-user.logged-in': true,
122 'action:auth-user.logged-out': true, 122 'action:auth-user.logged-out': true,
123 // Fired when the application loaded user information (using tokens from the local storage or after a successful login) 123 // Fired when the application loaded user information (using tokens from the local storage or after a successful login)
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 8521f684e..bd36c41cd 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -247,8 +247,8 @@ tags:
247 ### Import 247 ### Import
248 248
249 - _URL_-based: where the URL points to any service supported by [youtube-dl](https://ytdl-org.github.io/youtube-dl/) 249 - _URL_-based: where the URL points to any service supported by [youtube-dl](https://ytdl-org.github.io/youtube-dl/)
250 - _magnet_-based: where the URI resolves to a BitTorrent ressource containing a single supported video file 250 - _magnet_-based: where the URI resolves to a BitTorrent resource containing a single supported video file
251 - _torrent_-based: where the metainfo file resolves to a BitTorrent ressource containing a single supported video file 251 - _torrent_-based: where the metainfo file resolves to a BitTorrent resource containing a single supported video file
252 252
253 The import function is practical when the desired video/audio is available online. It makes PeerTube 253 The import function is practical when the desired video/audio is available online. It makes PeerTube
254 download it for you, saving you as much bandwidth and avoiding any instability or limitation your network might have. 254 download it for you, saving you as much bandwidth and avoiding any instability or limitation your network might have.
@@ -2053,7 +2053,7 @@ paths:
2053 x-summary: video file too large, due to quota or max body size limit set by the reverse-proxy 2053 x-summary: video file too large, due to quota or max body size limit set by the reverse-proxy
2054 description: | 2054 description: |
2055 If the response has no body, it means the reverse-proxy didn't let it through. Otherwise disambiguate via `type`: 2055 If the response has no body, it means the reverse-proxy didn't let it through. Otherwise disambiguate via `type`:
2056 - `quota_reached` for quota limits wether daily or global 2056 - `quota_reached` for quota limits whether daily or global
2057 headers: 2057 headers:
2058 X-File-Maximum-Size: 2058 X-File-Maximum-Size:
2059 schema: 2059 schema:
@@ -5277,7 +5277,7 @@ components:
5277 moderator: Moderator scope 5277 moderator: Moderator scope
5278 user: User scope 5278 user: User scope
5279 schemas: 5279 schemas:
5280 # Resuable core properties 5280 # Reusable core properties
5281 id: 5281 id:
5282 type: integer 5282 type: integer
5283 minimum: 1 5283 minimum: 1
@@ -5443,7 +5443,7 @@ components:
5443 - 1 5443 - 1
5444 - 2 5444 - 2
5445 - 3 5445 - 3
5446 description: 'The live latency mode (Default = `1`, HIght latency = `2`, Small Latency = `3`)' 5446 description: 'The live latency mode (Default = `1`, High latency = `2`, Small Latency = `3`)'
5447 5447
5448 VideoStateConstant: 5448 VideoStateConstant:
5449 properties: 5449 properties:
@@ -7754,7 +7754,7 @@ components:
7754 - 5 7754 - 5
7755 nullable: true 7755 nullable: true
7756 description: > 7756 description: >
7757 Error type if an error occured during the live session: 7757 Error type if an error occurred during the live session:
7758 - `1`: Bad socket health (transcoding is too slow) 7758 - `1`: Bad socket health (transcoding is too slow)
7759 - `2`: Max duration exceeded 7759 - `2`: Max duration exceeded
7760 - `3`: Quota exceeded 7760 - `3`: Quota exceeded
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md
index c6cbe83a6..378cb8502 100644
--- a/support/doc/dependencies.md
+++ b/support/doc/dependencies.md
@@ -513,7 +513,7 @@ If `sudo -u postgres createuser -P peertube` gives you an `unknown user: postgre
513``` 513```
514net-libs/nodejs 514net-libs/nodejs
515sys-apps/yarn 515sys-apps/yarn
516media-video/ffmpeg[x264] # Optionnally add vorbis,vpx 516media-video/ffmpeg[x264] # Optionally add vorbis,vpx
517dev-db/postgresql 517dev-db/postgresql
518dev-db/redis 518dev-db/redis
519dev-vcs/git 519dev-vcs/git
diff --git a/support/openapi/kotlin/README.mustache b/support/openapi/kotlin/README.mustache
index ac7fbdea9..376314650 100644
--- a/support/openapi/kotlin/README.mustache
+++ b/support/openapi/kotlin/README.mustache
@@ -34,7 +34,7 @@ This runs all tests and packages the library.
34<a name="documentation-for-api-endpoints"></a> 34<a name="documentation-for-api-endpoints"></a>
35## Documentation for API Endpoints 35## Documentation for API Endpoints
36 36
37All URIs are relative to *{{{basePath}}}*. Change it when instanciating `ApiClient(basePath)`. 37All URIs are relative to *{{{basePath}}}*. Change it when instantiating `ApiClient(basePath)`.
38 38
39Class | Method | HTTP request | Description 39Class | Method | HTTP request | Description
40------------ | ------------- | ------------- | ------------- 40------------ | ------------- | ------------- | -------------