Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix lint

Chocobozzz22e27dbd4917
diff --git a/client/.stylelintrc.json b/client/.stylelintrc.json
index 148871a07c..a891c68457 100644
--- a/client/.stylelintrc.json
+++ b/client/.stylelintrc.json
@@ -33,7 +33,6 @@
}
],
"scss/selector-no-redundant-nesting-selector": null,
- "scss/at-import-no-partial-leading-underscore": null,
"color-hex-length": null,
"selector-pseudo-element-no-unknown": [
true,
@@ -66,8 +65,8 @@
true,
{
"ignoreProperties": [
- "mask-image",
- "mask-size"
+ "-webkit-mask-image",
+ "-webkit-mask-size"
]
}
]
diff --git a/client/e2e/src/po/login.po.ts b/client/e2e/src/po/login.po.ts
index 6e59b389d0..ed59f45878 100644
--- a/client/e2e/src/po/login.po.ts
+++ b/client/e2e/src/po/login.po.ts
@@ -1,9 +1,6 @@
import { browserSleep, go, isAndroid } from '../utils'
export class LoginPage {
- constructor (private isMobileDevice: boolean) {
- }
-
async login (options: {
username: string
password: string
diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts
index c8dcb6e68f..3d670d99a1 100644
--- a/client/e2e/src/po/video-watch.po.ts
+++ b/client/e2e/src/po/video-watch.po.ts
@@ -1,7 +1,7 @@
import { browserSleep, FIXTURE_URLS, go } from '../utils'
export class VideoWatchPage {
- constructor (private isMobileDevice: boolean, private isSafari: boolean) {
+ constructor (private isSafari: boolean) {
}
waitWatchVideoName (videoName: string, maxTime?: number) {
diff --git a/client/e2e/src/suites-all/live.e2e-spec.ts b/client/e2e/src/suites-all/live.e2e-spec.ts
index 8bf8f3f736..203a07e3a5 100644
--- a/client/e2e/src/suites-all/live.e2e-spec.ts
+++ b/client/e2e/src/suites-all/live.e2e-spec.ts
@@ -1,13 +1,13 @@
import { PlayerPage } from '../po/player.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { FIXTURE_URLS, go, isMobileDevice, isSafari, prepareWebBrowser } from '../utils'
+import { FIXTURE_URLS, go, isSafari, prepareWebBrowser } from '../utils'
describe('Live all workflow', () => {
let videoWatchPage: VideoWatchPage
let playerPage: PlayerPage
beforeEach(async () => {
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
playerPage = new PlayerPage()
await prepareWebBrowser()
diff --git a/client/e2e/src/suites-all/private-videos.e2e-spec.ts b/client/e2e/src/suites-all/private-videos.e2e-spec.ts
index d73070d39e..b3fd22d874 100644
--- a/client/e2e/src/suites-all/private-videos.e2e-spec.ts
+++ b/client/e2e/src/suites-all/private-videos.e2e-spec.ts
@@ -1,7 +1,7 @@
import { LoginPage } from '../po/login.po'
import { PlayerPage } from '../po/player.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { FIXTURE_URLS, go, isMobileDevice, isSafari, prepareWebBrowser } from '../utils'
+import { FIXTURE_URLS, go, isSafari, prepareWebBrowser } from '../utils'
async function checkCorrectlyPlay (playerPage: PlayerPage) {
await playerPage.playAndPauseVideo(false, 2)
@@ -18,8 +18,8 @@ describe('Private videos all workflow', () => {
const internalHLSOnlyVideoName = 'Internal E2E test - HLS only'
beforeEach(async () => {
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
- loginPage = new LoginPage(isMobileDevice())
+ videoWatchPage = new VideoWatchPage(isSafari())
+ loginPage = new LoginPage()
playerPage = new PlayerPage()
await prepareWebBrowser()
diff --git a/client/e2e/src/suites-all/videos.e2e-spec.ts b/client/e2e/src/suites-all/videos.e2e-spec.ts
index c7cedb365e..fbca57ab30 100644
--- a/client/e2e/src/suites-all/videos.e2e-spec.ts
+++ b/client/e2e/src/suites-all/videos.e2e-spec.ts
@@ -47,11 +47,11 @@ describe('Videos all workflow', () => {
})
beforeEach(async () => {
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
videoPublishPage = new VideoPublishPage()
videoUpdatePage = new VideoUpdatePage()
myAccountPage = new MyAccountPage()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
playerPage = new PlayerPage()
videoListPage = new VideoListPage(isMobileDevice(), isSafari())
myVideosPage = new MyVideosPage()
diff --git a/client/e2e/src/suites-local/bulk-update.e2e-spec.ts b/client/e2e/src/suites-local/bulk-update.e2e-spec.ts
index d628b9b853..0994b15d21 100644
--- a/client/e2e/src/suites-local/bulk-update.e2e-spec.ts
+++ b/client/e2e/src/suites-local/bulk-update.e2e-spec.ts
@@ -3,7 +3,7 @@ import { LoginPage } from '../po/login.po'
import { MyVideosPage } from '../po/my-videos.po'
import { VideoPublishPage } from '../po/video-publish.po'
import { VideoUpdatePage } from '../po/video-update.po'
-import { isMobileDevice, prepareWebBrowser, waitServerUp } from '../utils'
+import { prepareWebBrowser, waitServerUp } from '../utils'
describe('Bulk update videos', () => {
let loginPage: LoginPage
@@ -17,7 +17,7 @@ describe('Bulk update videos', () => {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
bulkUpdatePage = new BulkUpdatePage()
myVideosPage = new MyVideosPage()
diff --git a/client/e2e/src/suites-local/channel.e2e-spec.ts b/client/e2e/src/suites-local/channel.e2e-spec.ts
index 9985c6630d..9fd81582bd 100644
--- a/client/e2e/src/suites-local/channel.e2e-spec.ts
+++ b/client/e2e/src/suites-local/channel.e2e-spec.ts
@@ -2,7 +2,7 @@ import { AdminUserPage } from '../po/admin-user.po'
import { ChannelPage } from '../po/channel.po'
import { LoginPage } from '../po/login.po'
import { NotificationPage } from '../po/notification.po'
-import { isMobileDevice, prepareWebBrowser, waitServerUp } from '../utils'
+import { prepareWebBrowser, waitServerUp } from '../utils'
describe('Channel management', () => {
let loginPage: LoginPage
@@ -25,7 +25,7 @@ describe('Channel management', () => {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
adminUserPage = new AdminUserPage()
channelPage = new ChannelPage()
notificationPage = new NotificationPage()
diff --git a/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts b/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts
index 1654db02b1..4d7a9816ae 100644
--- a/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts
+++ b/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts
@@ -1,7 +1,7 @@
import { LoginPage } from '../po/login.po'
import { VideoPublishPage } from '../po/video-publish.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { go, isMobileDevice, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
+import { go, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
describe('Custom server defaults', () => {
let videoPublishPage: VideoPublishPage
@@ -11,9 +11,9 @@ describe('Custom server defaults', () => {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
await prepareWebBrowser({ hidePrivacyConcerns: false })
})
diff --git a/client/e2e/src/suites-local/nsfw.e2e-spec.ts b/client/e2e/src/suites-local/nsfw.e2e-spec.ts
index 4d34ad632c..3794ee8778 100644
--- a/client/e2e/src/suites-local/nsfw.e2e-spec.ts
+++ b/client/e2e/src/suites-local/nsfw.e2e-spec.ts
@@ -146,13 +146,13 @@ describe('NSFW', () => {
beforeEach(async () => {
videoListPage = new VideoListPage(isMobileDevice(), isSafari())
adminConfigPage = new AdminConfigPage()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
adminUserPage = new AdminUserPage()
videoPublishPage = new VideoPublishPage()
myAccountPage = new MyAccountPage()
videoSearchPage = new VideoSearchPage()
playerPage = new PlayerPage()
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
anonymousSettingsPage = new AnonymousSettingsPage()
await prepareWebBrowser()
diff --git a/client/e2e/src/suites-local/page-crash.e2e-spec.ts b/client/e2e/src/suites-local/page-crash.e2e-spec.ts
index dc46dac2ba..b718020c20 100644
--- a/client/e2e/src/suites-local/page-crash.e2e-spec.ts
+++ b/client/e2e/src/suites-local/page-crash.e2e-spec.ts
@@ -2,7 +2,7 @@ import { AdminConfigPage } from '../po/admin-config.po'
import { LoginPage } from '../po/login.po'
import { VideoPublishPage } from '../po/video-publish.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { getScreenshotPath, go, isMobileDevice, isSafari, prepareWebBrowser, selectCustomSelect, waitServerUp } from '../utils'
+import { getScreenshotPath, go, isSafari, prepareWebBrowser, selectCustomSelect, waitServerUp } from '../utils'
// These tests help to notice crash with invalid translated strings
describe('Page crash', () => {
@@ -58,9 +58,9 @@ describe('Page crash', () => {
await waitServerUp()
adminConfigPage = new AdminConfigPage()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
await prepareWebBrowser()
})
diff --git a/client/e2e/src/suites-local/player-settings.e2e-spec.ts b/client/e2e/src/suites-local/player-settings.e2e-spec.ts
index 65f1278e8f..cf00eb493f 100644
--- a/client/e2e/src/suites-local/player-settings.e2e-spec.ts
+++ b/client/e2e/src/suites-local/player-settings.e2e-spec.ts
@@ -3,7 +3,7 @@ import { LoginPage } from '../po/login.po'
import { MyAccountPage } from '../po/my-account.po'
import { VideoPublishPage } from '../po/video-publish.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { go, isMobileDevice, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
+import { go, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
describe('Player settings', () => {
let videoPublishPage: VideoPublishPage
@@ -15,9 +15,9 @@ describe('Player settings', () => {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
myAccountPage = new MyAccountPage()
anonymousSettingsPage = new AnonymousSettingsPage()
diff --git a/client/e2e/src/suites-local/plugins.e2e-spec.ts b/client/e2e/src/suites-local/plugins.e2e-spec.ts
index e3fede40ea..c7a996b5c2 100644
--- a/client/e2e/src/suites-local/plugins.e2e-spec.ts
+++ b/client/e2e/src/suites-local/plugins.e2e-spec.ts
@@ -1,7 +1,7 @@
import { AdminPluginPage } from '../po/admin-plugin.po'
import { LoginPage } from '../po/login.po'
import { VideoPublishPage } from '../po/video-publish.po'
-import { getCheckbox, isMobileDevice, prepareWebBrowser, waitServerUp } from '../utils'
+import { getCheckbox, prepareWebBrowser, waitServerUp } from '../utils'
describe('Plugins', () => {
let videoPublishPage: VideoPublishPage
@@ -24,7 +24,7 @@ describe('Plugins', () => {
})
beforeEach(async () => {
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
adminPluginPage = new AdminPluginPage()
diff --git a/client/e2e/src/suites-local/publish-live.e2e-spec.ts b/client/e2e/src/suites-local/publish-live.e2e-spec.ts
index d8390a5379..bc9bc78009 100644
--- a/client/e2e/src/suites-local/publish-live.e2e-spec.ts
+++ b/client/e2e/src/suites-local/publish-live.e2e-spec.ts
@@ -2,7 +2,7 @@ import { AdminConfigPage } from '../po/admin-config.po'
import { LoginPage } from '../po/login.po'
import { VideoPublishPage } from '../po/video-publish.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { isMobileDevice, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
+import { isSafari, prepareWebBrowser, waitServerUp } from '../utils'
describe('Publish live', function () {
let videoPublishPage: VideoPublishPage
@@ -13,10 +13,10 @@ describe('Publish live', function () {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
adminConfigPage = new AdminConfigPage()
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
await prepareWebBrowser()
diff --git a/client/e2e/src/suites-local/publish.e2e-spec.ts b/client/e2e/src/suites-local/publish.e2e-spec.ts
index 654d267de6..b9d479f5a2 100644
--- a/client/e2e/src/suites-local/publish.e2e-spec.ts
+++ b/client/e2e/src/suites-local/publish.e2e-spec.ts
@@ -1,7 +1,7 @@
import { LoginPage } from '../po/login.po'
import { VideoPublishPage } from '../po/video-publish.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { isMobileDevice, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
+import { isSafari, prepareWebBrowser, waitServerUp } from '../utils'
describe('Publish video', () => {
let videoPublishPage: VideoPublishPage
@@ -11,9 +11,9 @@ describe('Publish video', () => {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
await prepareWebBrowser()
diff --git a/client/e2e/src/suites-local/signup.e2e-spec.ts b/client/e2e/src/suites-local/signup.e2e-spec.ts
index ee911cb2c1..0a0f4bf8d8 100644
--- a/client/e2e/src/suites-local/signup.e2e-spec.ts
+++ b/client/e2e/src/suites-local/signup.e2e-spec.ts
@@ -9,7 +9,6 @@ import {
getScreenshotPath,
getVerificationLink,
go,
- isMobileDevice,
MockSMTPServer,
prepareWebBrowser,
waitServerUp
@@ -101,7 +100,7 @@ describe('Signup', () => {
})
beforeEach(async () => {
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
adminConfigPage = new AdminConfigPage()
signupPage = new SignupPage()
adminRegistrationPage = new AdminRegistrationPage()
diff --git a/client/e2e/src/suites-local/user-settings.e2e-spec.ts b/client/e2e/src/suites-local/user-settings.e2e-spec.ts
index b915e80495..235e0560b8 100644
--- a/client/e2e/src/suites-local/user-settings.e2e-spec.ts
+++ b/client/e2e/src/suites-local/user-settings.e2e-spec.ts
@@ -1,17 +1,7 @@
import { AdminConfigPage } from '../po/admin-config.po'
import { LoginPage } from '../po/login.po'
import { MyAccountPage } from '../po/my-account.po'
-import {
- browserSleep,
- findEmailTo,
- getEmailPort,
- getVerificationLink,
- go,
- isMobileDevice,
- MockSMTPServer,
- prepareWebBrowser,
- waitServerUp
-} from '../utils'
+import { browserSleep, findEmailTo, getEmailPort, getVerificationLink, go, MockSMTPServer, prepareWebBrowser, waitServerUp } from '../utils'
describe('User settings', () => {
let loginPage: LoginPage
@@ -23,7 +13,7 @@ describe('User settings', () => {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
myAccountPage = new MyAccountPage()
adminConfigPage = new AdminConfigPage()
diff --git a/client/e2e/src/suites-local/video-password.e2e-spec.ts b/client/e2e/src/suites-local/video-password.e2e-spec.ts
index 90f0d1368d..81d6c0971f 100644
--- a/client/e2e/src/suites-local/video-password.e2e-spec.ts
+++ b/client/e2e/src/suites-local/video-password.e2e-spec.ts
@@ -4,7 +4,7 @@ import { PlayerPage } from '../po/player.po'
import { SignupPage } from '../po/signup.po'
import { VideoPublishPage } from '../po/video-publish.po'
import { VideoWatchPage } from '../po/video-watch.po'
-import { go, isMobileDevice, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
+import { go, isSafari, prepareWebBrowser, waitServerUp } from '../utils'
describe('Password protected videos', () => {
let videoPublishPage: VideoPublishPage
@@ -43,9 +43,9 @@ describe('Password protected videos', () => {
before(async () => {
await waitServerUp()
- loginPage = new LoginPage(isMobileDevice())
+ loginPage = new LoginPage()
videoPublishPage = new VideoPublishPage()
- videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+ videoWatchPage = new VideoWatchPage(isSafari())
signupPage = new SignupPage()
playerPage = new PlayerPage()
myAccountPage = new MyAccountPage()
diff --git a/client/eslint.config.mjs b/client/eslint.config.mjs
index ae608052b6..05084cb454 100644
--- a/client/eslint.config.mjs
+++ b/client/eslint.config.mjs
@@ -1,7 +1,7 @@
-import { defineConfig, globalIgnores } from 'eslint/config'
-import love from 'eslint-config-love'
import stylistic from '@stylistic/eslint-plugin'
import angular from 'angular-eslint'
+import love from 'eslint-config-love'
+import { defineConfig, globalIgnores } from 'eslint/config'
export default defineConfig([
globalIgnores([
@@ -185,7 +185,20 @@ export default defineConfig([
'radix': 'off',
'no-plusplus': 'off',
'@typescript-eslint/no-unnecessary-type-conversion': 'off',
- 'no-promise-executor-return': 'off'
+ 'no-promise-executor-return': 'off',
+ 'prefer-template': 'off',
+ '@typescript-eslint/no-useless-default-assignment': 'off',
+ '@angular-eslint/prefer-on-push-component-change-detection': 'off',
+ 'require-unicode-regexp': 'off',
+ 'no-await-in-loop': 'off',
+ // TODO: enable
+ 'prefer-named-capture-group': 'off',
+ // TODO: enable
+ 'prefer-object-spread': 'off',
+ '@eslint-community/eslint-comments/require-description': 'off',
+ '@typescript-eslint/strict-void-return': 'off',
+ 'prefer-object-has-own': 'off',
+ 'prefer-arrow-callback': 'off'
},
languageOptions: {
diff --git a/client/src/app/+admin/overview/videos/video-list.component.ts b/client/src/app/+admin/overview/videos/video-list.component.ts
index b08e12e5c3..c47276f11c 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.ts
+++ b/client/src/app/+admin/overview/videos/video-list.component.ts
@@ -336,7 +336,7 @@ export class VideoListComponent implements OnInit {
}
getFilesSize (video: Video) {
- let total = getAllFiles(video).reduce((p, f) => p += f.size, 0)
+ let total = getAllFiles(video).reduce((p, f) => p + f.size, 0)
if (video.videoSource?.fileDownloadUrl) {
total += video.videoSource.size || 0
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
index 26dd26677b..2f8bde5fb3 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
@@ -1,10 +1,9 @@
-import { Component, OnInit, inject, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { ActivatedRoute, RouterLink } from '@angular/router'
import {
AuthService,
ComponentPagination,
- ConfirmService,
Notifier,
PeerTubeRouterService,
ScreenService,
@@ -59,7 +58,6 @@ type DisplayFilter = 'all' | 'owned'
export class MyVideoChannelsComponent implements OnInit {
private authService = inject(AuthService)
private notifier = inject(Notifier)
- private confirmService = inject(ConfirmService)
private videoChannelService = inject(VideoChannelService)
private screenService = inject(ScreenService)
private route = inject(ActivatedRoute)
diff --git a/client/src/app/+search/search.component.ts b/client/src/app/+search/search.component.ts
index fd38ce92e1..9d7bf67b5f 100644
--- a/client/src/app/+search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -1,5 +1,5 @@
import { NgTemplateOutlet } from '@angular/common'
-import { Component, inject, OnDestroy, OnInit, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, inject, OnDestroy, OnInit } from '@angular/core'
import { ActivatedRoute, Router, RouterLink } from '@angular/router'
import { AuthService, HooksService, MetaService, Notifier, ServerService, User, UserService } from '@app/core'
import { immutableAssign, SimpleMemoize } from '@app/helpers'
@@ -169,7 +169,7 @@ export class SearchComponent implements OnInit, OnDestroy {
this.results = this.results.concat(result.data)
}
- this.pagination.totalItems = results.reduce((p, r) => p += r.total, 0)
+ this.pagination.totalItems = results.reduce((p, r) => p + r.total, 0)
this.lastSearchTarget = this.advancedSearch.searchTarget
this.hasMoreResults = this.results.length < this.pagination.totalItems
diff --git a/client/src/app/+video-list/overview/video-overview.component.ts b/client/src/app/+video-list/overview/video-overview.component.ts
index 2a64e1a8f1..cdf43367b2 100644
--- a/client/src/app/+video-list/overview/video-overview.component.ts
+++ b/client/src/app/+video-list/overview/video-overview.component.ts
@@ -1,5 +1,15 @@
import { CommonModule } from '@angular/common'
-import { AfterViewChecked, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, inject, viewChild, ChangeDetectionStrategy } from '@angular/core'
+import {
+ AfterViewChecked,
+ ChangeDetectionStrategy,
+ ChangeDetectorRef,
+ Component,
+ ElementRef,
+ OnDestroy,
+ OnInit,
+ inject,
+ viewChild
+} from '@angular/core'
import { RouterLink } from '@angular/router'
import { DisableForReuseHook, Notifier, PeerTubeRouterService, ServerService, User, UserService } from '@app/core'
import { ActorAvatarComponent, ActorAvatarInput } from '@app/shared/shared-actor-image/actor-avatar.component'
diff --git a/client/src/app/+videos-publish-manage/+video-publish/upload/video-upload.component.ts b/client/src/app/+videos-publish-manage/+video-publish/upload/video-upload.component.ts
index 8f14da8d22..9b94d6b70a 100644
--- a/client/src/app/+videos-publish-manage/+video-publish/upload/video-upload.component.ts
+++ b/client/src/app/+videos-publish-manage/+video-publish/upload/video-upload.component.ts
@@ -1,4 +1,15 @@
-import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, inject, input, output, viewChild, ChangeDetectionStrategy } from '@angular/core'
+import {
+ AfterViewInit,
+ ChangeDetectionStrategy,
+ Component,
+ ElementRef,
+ OnDestroy,
+ OnInit,
+ inject,
+ input,
+ output,
+ viewChild
+} from '@angular/core'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { ActivatedRoute } from '@angular/router'
import { VideoEdit } from '@app/+videos-publish-manage/shared-manage/common/video-edit.model'
@@ -7,10 +18,10 @@ import { VideoManageController } from '@app/+videos-publish-manage/shared-manage
import { AuthService, CanComponentDeactivate, HooksService, MetaService, Notifier, ServerService } from '@app/core'
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
import { UserVideoQuota, VideoPrivacyType } from '@peertube/peertube-models'
+import { SelectChannelItem } from '@pt-types'
import debug from 'debug'
import { truncate } from 'lodash-es'
import { Subscription } from 'rxjs'
-import { SelectChannelItem } from '@pt-types'
import { ImageInputComponent } from '../../../shared/shared-forms/image-input.component'
import { SelectChannelComponent } from '../../../shared/shared-forms/select/select-channel.component'
import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component'
diff --git a/client/src/app/+videos-publish-manage/shared-manage/common/video-edit.model.ts b/client/src/app/+videos-publish-manage/shared-manage/common/video-edit.model.ts
index 26f988f1bb..e78d0e5a63 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/common/video-edit.model.ts
+++ b/client/src/app/+videos-publish-manage/shared-manage/common/video-edit.model.ts
@@ -265,6 +265,8 @@ export class VideoEdit {
return videoEdit
}
+ // False positive
+ // eslint-disable-next-line @typescript-eslint/no-unused-private-class-members
private loadFromImport (options: CreateFromImportOptions) {
this.loadFromPublish(options, false)
@@ -286,6 +288,8 @@ export class VideoEdit {
return videoEdit
}
+ // False positive
+ // eslint-disable-next-line @typescript-eslint/no-unused-private-class-members
private loadFromLive (options: CreateFromLiveOptions) {
this.loadFromPublish(options, true)
diff --git a/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts b/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts
index 6b1cf42d45..53ec00636b 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts
+++ b/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts
@@ -1,5 +1,5 @@
import { CommonModule } from '@angular/common'
-import { Component, LOCALE_ID, OnInit, inject, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, LOCALE_ID, OnInit, inject } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { ActivatedRoute } from '@angular/router'
import { Notifier, PeerTubeRouterService, ServerService } from '@app/core'
@@ -723,6 +723,8 @@ export class VideoStatsComponent implements OnInit {
return getComputedStyle(document.documentElement).getPropertyValue('--border-primary')
}
+ // False positive
+ // eslint-disable-next-line @typescript-eslint/no-unused-private-class-members
private formatXTick (options: {
graphId: ActiveGraphId
value: number | string
diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts
index b8c10feb54..016dd64de3 100644
--- a/client/src/app/core/plugins/plugin.service.ts
+++ b/client/src/app/core/plugins/plugin.service.ts
@@ -171,6 +171,7 @@ export class PluginService implements ClientHook {
async translateSetting (npmName: string, setting: RegisterClientFormFieldOptions) {
for (const key of getKeys(setting, [ 'label', 'html', 'descriptionHTML' ])) {
+ // eslint-disable-next-line require-atomic-updates
if (setting[key]) setting[key] = await this.translateBy(npmName, setting[key])
}
diff --git a/client/src/app/helpers/utils/simple-memoize.ts b/client/src/app/helpers/utils/simple-memoize.ts
index b18b069d4c..1fc548eecc 100644
--- a/client/src/app/helpers/utils/simple-memoize.ts
+++ b/client/src/app/helpers/utils/simple-memoize.ts
@@ -7,7 +7,7 @@ export function SimpleMemoize () {
const store = new Map()
return (_target: object, _propertyKey: string, descriptor: TypedPropertyDescriptor<any>) => {
- if (descriptor.value != null) {
+ if (descriptor.value !== null) {
descriptor.value = getNewFunction(descriptor.value, store)
return
}
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
index e557dbd26f..2f19534bb2 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
@@ -1,4 +1,15 @@
-import { Component, ElementRef, OnChanges, OnInit, booleanAttribute, inject, input, output, viewChild, ChangeDetectionStrategy } from '@angular/core'
+import {
+ ChangeDetectionStrategy,
+ Component,
+ ElementRef,
+ OnChanges,
+ OnInit,
+ booleanAttribute,
+ inject,
+ input,
+ output,
+ viewChild
+} from '@angular/core'
import { Notifier, ServerService } from '@app/core'
import { NgbDropdown, NgbDropdownMenu, NgbDropdownToggle, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
import { ActorImage } from '@peertube/peertube-models'
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
index 15c81de771..2204e12f6f 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
@@ -1,5 +1,16 @@
import { CommonModule, NgTemplateOutlet } from '@angular/common'
-import { Component, ElementRef, OnChanges, OnInit, booleanAttribute, inject, input, output, viewChild, ChangeDetectionStrategy } from '@angular/core'
+import {
+ ChangeDetectionStrategy,
+ Component,
+ ElementRef,
+ OnChanges,
+ OnInit,
+ booleanAttribute,
+ inject,
+ input,
+ output,
+ viewChild
+} from '@angular/core'
import { SafeResourceUrl } from '@angular/platform-browser'
import { Notifier, ServerService } from '@app/core'
import { NgbDropdownModule, NgbPopover, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
diff --git a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
index de527a53b4..a9da7295a7 100644
--- a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
+++ b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
@@ -1,5 +1,16 @@
import { CommonModule, NgTemplateOutlet } from '@angular/common'
-import { Component, ElementRef, OnChanges, OnInit, booleanAttribute, inject, input, numberAttribute, viewChild, ChangeDetectionStrategy } from '@angular/core'
+import {
+ ChangeDetectionStrategy,
+ Component,
+ ElementRef,
+ OnChanges,
+ OnInit,
+ booleanAttribute,
+ inject,
+ input,
+ numberAttribute,
+ viewChild
+} from '@angular/core'
import { RouterLink } from '@angular/router'
import { objectKeysTyped } from '@peertube/peertube-core-utils'
import { ActorImage } from '@peertube/peertube-models'
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.ts b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
index 66f3b7c638..5da9d7ce52 100644
--- a/client/src/app/shared/shared-forms/markdown-textarea.component.ts
+++ b/client/src/app/shared/shared-forms/markdown-textarea.component.ts
@@ -1,5 +1,17 @@
import { CommonModule, NgTemplateOutlet, ViewportScroller } from '@angular/common'
-import { booleanAttribute, Component, ElementRef, forwardRef, inject, input, model, OnDestroy, OnInit, viewChild, ChangeDetectionStrategy } from '@angular/core'
+import {
+ booleanAttribute,
+ ChangeDetectionStrategy,
+ Component,
+ ElementRef,
+ forwardRef,
+ inject,
+ input,
+ model,
+ OnDestroy,
+ OnInit,
+ viewChild
+} from '@angular/core'
import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'
import { SafeHtml } from '@angular/platform-browser'
import { MarkdownService, ScreenService } from '@app/core'
diff --git a/client/src/app/shared/shared-forms/peertube-checkbox.component.ts b/client/src/app/shared/shared-forms/peertube-checkbox.component.ts
index f447abaf35..9706b27be8 100644
--- a/client/src/app/shared/shared-forms/peertube-checkbox.component.ts
+++ b/client/src/app/shared/shared-forms/peertube-checkbox.component.ts
@@ -1,5 +1,15 @@
import { NgTemplateOutlet } from '@angular/common'
-import { AfterContentInit, booleanAttribute, Component, contentChildren, forwardRef, input, model, TemplateRef, ChangeDetectionStrategy } from '@angular/core'
+import {
+ AfterContentInit,
+ booleanAttribute,
+ ChangeDetectionStrategy,
+ Component,
+ contentChildren,
+ forwardRef,
+ input,
+ model,
+ TemplateRef
+} from '@angular/core'
import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'
import { HelpComponent } from '../shared-main/buttons/help.component'
import { PeerTubeTemplateDirective } from '../shared-main/common/peertube-template.directive'
diff --git a/client/src/app/shared/shared-forms/search-input.component.ts b/client/src/app/shared/shared-forms/search-input.component.ts
index 93e415f439..4706604f04 100644
--- a/client/src/app/shared/shared-forms/search-input.component.ts
+++ b/client/src/app/shared/shared-forms/search-input.component.ts
@@ -1,5 +1,15 @@
import { NgClass } from '@angular/common'
-import { AfterViewInit, Component, DestroyRef, OnInit, booleanAttribute, inject, input, output, ChangeDetectionStrategy } from '@angular/core'
+import {
+ AfterViewInit,
+ ChangeDetectionStrategy,
+ Component,
+ DestroyRef,
+ OnInit,
+ booleanAttribute,
+ inject,
+ input,
+ output
+} from '@angular/core'
import { takeUntilDestroyed } from '@angular/core/rxjs-interop'
import { FormsModule } from '@angular/forms'
import { ActivatedRoute, Router } from '@angular/router'
diff --git a/client/src/app/shared/shared-forms/timestamp-input.component.ts b/client/src/app/shared/shared-forms/timestamp-input.component.ts
index a943a7b727..4a6633f87c 100644
--- a/client/src/app/shared/shared-forms/timestamp-input.component.ts
+++ b/client/src/app/shared/shared-forms/timestamp-input.component.ts
@@ -1,5 +1,16 @@
import { NgClass } from '@angular/common'
-import { booleanAttribute, ChangeDetectorRef, Component, forwardRef, OnInit, inject, input, model, output, ChangeDetectionStrategy } from '@angular/core'
+import {
+ booleanAttribute,
+ ChangeDetectionStrategy,
+ ChangeDetectorRef,
+ Component,
+ forwardRef,
+ inject,
+ input,
+ model,
+ OnInit,
+ output
+} from '@angular/core'
import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'
import { secondsToTime, timeToInt } from '@peertube/peertube-core-utils'
import { InputMaskModule } from 'primeng/inputmask'
diff --git a/client/src/app/shared/shared-main/common/defer-loading.directive.ts b/client/src/app/shared/shared-main/common/defer-loading.directive.ts
index b94cea0bf0..257974bddf 100644
--- a/client/src/app/shared/shared-main/common/defer-loading.directive.ts
+++ b/client/src/app/shared/shared-main/common/defer-loading.directive.ts
@@ -1,4 +1,3 @@
-import debug from 'debug'
import {
AfterViewInit,
ChangeDetectorRef,
@@ -8,10 +7,11 @@ import {
OnDestroy,
TemplateRef,
ViewContainerRef,
+ contentChild,
inject,
- output,
- contentChild
+ output
} from '@angular/core'
+import debug from 'debug'
const debugLogger = debug('peertube:main:DeferLoadingDirective')
@@ -60,7 +60,7 @@ export class DeferLoadingDirective implements AfterViewInit, OnDestroy {
}
isLoaded () {
- return this.view != null
+ return this.view !== null && this.view !== undefined
}
ngOnDestroy () {
diff --git a/client/src/app/shared/shared-main/date/time-duration-formatter.pipe.ts b/client/src/app/shared/shared-main/date/time-duration-formatter.pipe.ts
index 4fd8d60d35..95a19e26cc 100644
--- a/client/src/app/shared/shared-main/date/time-duration-formatter.pipe.ts
+++ b/client/src/app/shared/shared-main/date/time-duration-formatter.pipe.ts
@@ -5,7 +5,6 @@ import { Pipe, PipeTransform } from '@angular/core'
standalone: true
})
export class TimeDurationFormatterPipe implements PipeTransform {
-
transform (value: number): string {
const hours = Math.floor(value / 3600)
const minutes = Math.floor((value % 3600) / 60)
@@ -23,7 +22,7 @@ export class TimeDurationFormatterPipe implements PipeTransform {
if (minutes > 0) {
let result = $localize`${minutes}min`
- if (seconds !== 0) result += ' ' + `${seconds}sec`
+ if (seconds !== 0) result += ' ' + $localize`${seconds}sec`
return result
}
diff --git a/client/src/app/shared/shared-share-modal/share-video.component.ts b/client/src/app/shared/shared-share-modal/share-video.component.ts
index f3e8ca3f55..a1d7d9d122 100644
--- a/client/src/app/shared/shared-share-modal/share-video.component.ts
+++ b/client/src/app/shared/shared-share-modal/share-video.component.ts
@@ -1,8 +1,8 @@
-import { Component, inject, input, OnInit, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, inject, input, OnInit } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
import { RouterLink } from '@angular/router'
-import { AuthService, HooksService, ServerService } from '@app/core'
+import { HooksService, ServerService } from '@app/core'
import { NgbCollapse, NgbNav, NgbNavContent, NgbNavItem, NgbNavLink, NgbNavLinkBase, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
import { buildVideoLink, decorateVideoLink } from '@peertube/peertube-core-utils'
import { VideoCaption, VideoPrivacy } from '@peertube/peertube-models'
@@ -44,7 +44,6 @@ export class ShareVideoComponent implements OnInit {
private sanitizer = inject(DomSanitizer)
private server = inject(ServerService)
private hooks = inject(HooksService)
- private authService = inject(AuthService)
readonly video = input<VideoDetails>(null)
readonly videoCaptions = input<VideoCaption[]>([])
diff --git a/client/src/app/shared/shared-video-miniature/videos-list.component.ts b/client/src/app/shared/shared-video-miniature/videos-list.component.ts
index e88f51c3dd..8433e01adc 100644
--- a/client/src/app/shared/shared-video-miniature/videos-list.component.ts
+++ b/client/src/app/shared/shared-video-miniature/videos-list.component.ts
@@ -1,5 +1,5 @@
import { CommonModule } from '@angular/common'
-import { Component, OnDestroy, OnInit, booleanAttribute, inject, input, output, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, booleanAttribute, inject, input, output } from '@angular/core'
import { ActivatedRoute } from '@angular/router'
import {
ComponentPagination,
@@ -131,8 +131,6 @@ export class VideosListComponent implements OnInit, OnDestroy {
obsHighlightedLives: Observable<Pick<ResultList<Video>, 'data'>>
}>()
- private alreadyDoneSearch = false
-
ngOnInit () {
this.displayOptions.by = this.displayBy()
this.displayOptions.avatar = this.displayBy()
@@ -327,14 +325,6 @@ export class VideosListComponent implements OnInit, OnDestroy {
this.routeSub = this.route.queryParams.subscribe(params => {
if (Object.keys(params).length === 0 && !this.filters.hasBeenCustomizedByUser()) return
- let search = params.search
-
- if (search) {
- this.alreadyDoneSearch = true
- } else if (this.alreadyDoneSearch) {
- search = ''
- }
-
debugLogger('Query params changed', params)
this.filters.load(params)
diff --git a/client/src/standalone/player/src/shared/settings/settings-menu-button.ts b/client/src/standalone/player/src/shared/settings/settings-menu-button.ts
index b268f60414..ec29240e91 100644
--- a/client/src/standalone/player/src/shared/settings/settings-menu-button.ts
+++ b/client/src/standalone/player/src/shared/settings/settings-menu-button.ts
@@ -172,8 +172,8 @@ class SettingsButton extends Button {
}
getComponentSize (element: VideojsComponent | HTMLElement) {
- let width: number = null
- let height: number = null
+ let width: number
+ let height: number
// Could be component or just DOM element
if (element instanceof Component) {
diff --git a/client/src/standalone/player/src/shared/settings/settings-menu-item.ts b/client/src/standalone/player/src/shared/settings/settings-menu-item.ts
index 2a9f13ad7e..04726ed2c6 100644
--- a/client/src/standalone/player/src/shared/settings/settings-menu-item.ts
+++ b/client/src/standalone/player/src/shared/settings/settings-menu-item.ts
@@ -119,7 +119,7 @@ class SettingsMenuItem extends MenuItem {
}
onSubmenuClick (event: any) {
- let target = null
+ let target
if (event.type === 'tap') {
target = event.target