Front + API: Rename video-channels-sync to video-channel-syncs (#754)

client/src/app/+my-library/+my-video-channels/my-video-channels.component.html

@@ -6,7 +6,7 @@ <h1>
   </span>
 
   <div>
-    <a routerLink="/my-library/video-channels-sync" class="button-link">
+    <a routerLink="/my-library/video-channel-syncs" class="button-link">
       <my-global-icon iconName="repeat" aria-hidden="true"></my-global-icon>
       <ng-container i18n>My synchronizations</ng-container>
     </a>

client/src/app/+my-library/my-library-routing.module.ts

@@ -6,8 +6,8 @@ import { MySubscriptionsComponent } from './my-follows/my-subscriptions.componen
 import { MyHistoryComponent } from './my-history/my-history.component'
 import { MyLibraryComponent } from './my-library.component'
 import { MyOwnershipComponent } from './my-ownership/my-ownership.component'
-import { MyVideoChannelsSyncComponent } from './my-video-channels-sync/my-video-channels-sync.component'
-import { VideoChannelSyncEditComponent } from './my-video-channels-sync/video-channel-sync-edit/video-channel-sync-edit.component'
+import { MyVideoChannelSyncsComponent } from './my-video-channel-syncs/my-video-channel-syncs.component'
+import { VideoChannelSyncEditComponent } from './my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component'
 import { MyVideoImportsComponent } from './my-video-imports/my-video-imports.component'
 import { MyVideoPlaylistCreateComponent } from './my-video-playlists/my-video-playlist-create.component'
 import { MyVideoPlaylistElementsComponent } from './my-video-playlists/my-video-playlist-elements.component'
@@ -136,8 +136,8 @@ const myLibraryRoutes: Routes = [
       },
 
       {
-        path: 'video-channels-sync',
-        component: MyVideoChannelsSyncComponent,
+        path: 'video-channel-syncs',
+        component: MyVideoChannelSyncsComponent,
         data: {
           meta: {
             title: $localize`My synchronizations`
@@ -146,7 +146,7 @@ const myLibraryRoutes: Routes = [
       },
 
       {
-        path: 'video-channels-sync/create',
+        path: 'video-channel-syncs/create',
         component: VideoChannelSyncEditComponent,
         data: {
           meta: {

client/src/app/+my-library/my-library.module.ts

@@ -29,8 +29,8 @@ import { MyVideoPlaylistUpdateComponent } from './my-video-playlists/my-video-pl
 import { MyVideoPlaylistsComponent } from './my-video-playlists/my-video-playlists.component'
 import { VideoChangeOwnershipComponent } from './my-videos/modals/video-change-ownership.component'
 import { MyVideosComponent } from './my-videos/my-videos.component'
-import { MyVideoChannelsSyncComponent } from './my-video-channels-sync/my-video-channels-sync.component'
-import { VideoChannelSyncEditComponent } from './my-video-channels-sync/video-channel-sync-edit/video-channel-sync-edit.component'
+import { MyVideoChannelSyncsComponent } from './my-video-channel-syncs/my-video-channel-syncs.component'
+import { VideoChannelSyncEditComponent } from './my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component'
 
 @NgModule({
   imports: [
@@ -65,7 +65,7 @@ import { VideoChannelSyncEditComponent } from './my-video-channels-sync/video-ch
     MyOwnershipComponent,
     MyAcceptOwnershipComponent,
     MyVideoImportsComponent,
-    MyVideoChannelsSyncComponent,
+    MyVideoChannelSyncsComponent,
     VideoChannelSyncEditComponent,
     MySubscriptionsComponent,
     MyFollowersComponent,

client/src/app/+my-library/my-video-channels-sync/my-video-channels-sync.component.ts → client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.ts

@@ -7,10 +7,10 @@ import { SortMeta } from 'primeng/api'
 import { mergeMap } from 'rxjs'
 
 @Component({
-  templateUrl: './my-video-channels-sync.component.html',
-  styleUrls: [ './my-video-channels-sync.component.scss' ]
+  templateUrl: './my-video-channel-syncs.component.html',
+  styleUrls: [ './my-video-channel-syncs.component.scss' ]
 })
-export class MyVideoChannelsSyncComponent extends RestTable implements OnInit {
+export class MyVideoChannelSyncsComponent extends RestTable implements OnInit {
 
   error: string = undefined
   channelsSync: VideoChannelSync[]
@@ -83,7 +83,7 @@ export class MyVideoChannelsSyncComponent extends RestTable implements OnInit {
   }
 
   getVideoChannelCreateLink () {
-    return '/my-library/video-channels-sync/create'
+    return '/my-library/video-channel-syncs/create'
   }
 
   getVideoChannelSyncStateClass (syncId: number) {

client/src/app/+my-library/my-video-channels-sync/video-channel-sync-edit/video-channel-sync-edit.component.ts → client/src/app/+my-library/my-video-channel-syncs/video-channel-sync-edit/video-channel-sync-edit.component.ts

@@ -64,7 +64,7 @@ export class VideoChannelSyncEditComponent extends FormReactive implements OnIni
       .subscribe({
         next: () => {
           this.notifier.success($localize`Synchronization created successfully.`)
-          this.router.navigate([ '/my-library', 'video-channels-sync' ])
+          this.router.navigate([ '/my-library', 'video-channel-syncs' ])
         },
 
         error: err => {

client/src/app/shared/shared-main/video-channel-sync/video-channel-sync.service.ts

@@ -12,7 +12,7 @@ import { Account, AccountService } from '../account'
   providedIn: 'root'
 })
 export class VideoChannelSyncService {
-  static BASE_VIDEO_CHANNEL_URL = environment.apiUrl + '/api/v1/video-channels-syncs'
+  static BASE_VIDEO_CHANNEL_URL = environment.apiUrl + '/api/v1/video-channel-syncs'
 
   constructor (
     private authHttp: HttpClient,
@@ -28,7 +28,7 @@ export class VideoChannelSyncService {
     const { pagination, sort, account } = parameters
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination, sort)
-    const url = AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels-syncs'
+    const url = AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channel-syncs'
     return this.authHttp.get<ResultList<VideoChannelSync>>(url, { params })
                .pipe(catchError(err => this.restExtractor.handleError(err)))
   }

server/controllers/api/accounts.ts

@@ -74,7 +74,7 @@ accountsRouter.get('/:accountName/video-channels',
   asyncMiddleware(listAccountChannels)
 )
 
-accountsRouter.get('/:accountName/video-channels-syncs',
+accountsRouter.get('/:accountName/video-channel-syncs',
   asyncMiddleware(accountNameWithHostGetValidator),
   paginationValidator,
   videoChannelSyncsSortValidator,

server/controllers/api/index.ts

@@ -44,7 +44,7 @@ apiRouter.use('/config', configRouter)
 apiRouter.use('/users', usersRouter)
 apiRouter.use('/accounts', accountsRouter)
 apiRouter.use('/video-channels', videoChannelRouter)
-apiRouter.use('/video-channels-syncs', videoChannelSyncRouter)
+apiRouter.use('/video-channel-syncs', videoChannelSyncRouter)
 apiRouter.use('/video-playlists', videoPlaylistRouter)
 apiRouter.use('/videos', videosRouter)
 apiRouter.use('/jobs', jobsRouter)

server/helpers/custom-validators/video-channels.ts

@@ -22,19 +22,11 @@ function isVideoChannelSupportValid (value: string) {
   return value === null || (exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.SUPPORT))
 }
 
-function isVideoChannelExternalChannelUrlValid (value: string) {
-  return value === null || (exists(value) &&
-    validator.matches(value, /^https?:\/\//) &&
-    validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.EXTERNAL_CHANNEL_URL
-    ))
-}
-
 // ---------------------------------------------------------------------------
 
 export {
   isVideoChannelUsernameValid,
   isVideoChannelDescriptionValid,
   isVideoChannelDisplayNameValid,
-  isVideoChannelSupportValid,
-  isVideoChannelExternalChannelUrlValid
+  isVideoChannelSupportValid
 }

server/models/video/video-channel-sync.ts

@@ -1,5 +1,4 @@
-import { isVideoChannelExternalChannelUrlValid } from "@server/helpers/custom-validators/video-channels"
-import { isVideoChannelSyncStateValid } from "@server/helpers/custom-validators/video-channels-sync"
+import { isVideoChannelSyncStateValid } from "@server/helpers/custom-validators/video-channel-syncs"
 import { CONSTRAINTS_FIELDS, VIDEO_CHANNEL_SYNC_STATE } from "@server/initializers/constants"
 import { VideoChannelSync, VideoChannelSyncState } from "@shared/models"
 import { MChannelSyncFormattable } from "@server/types/models/video/video-channel-sync"
@@ -23,6 +22,7 @@ import { VideoChannelModel } from "./video-channel"
 import { ActorModel } from "../actor/actor"
 import { Op } from "sequelize"
 import { UserModel } from "../user/user"
+import { isVideoImportTargetUrlValid } from "@server/helpers/custom-validators/video-imports"
 
 type AvailableForListOptions = {
   accountId: number
@@ -39,7 +39,7 @@ export class VideoChannelSyncModel extends Model<Partial<AttributesOnly<VideoCha
 
   @AllowNull(false)
   @Default(null)
-  @Is('VideoChannelExternalChannelUrl', value => throwIfNotValid(value, isVideoChannelExternalChannelUrlValid, 'externalChannelUrl', true))
+  @Is('VideoChannelExternalChannelUrl', value => throwIfNotValid(value, isVideoImportTargetUrlValid, 'externalChannelUrl', true))
   @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNEL_SYNCS.EXTERNAL_CHANNEL_URL.max))
   externalChannelUrl: string
 

support/doc/api/openapi.yaml

@@ -3288,7 +3288,7 @@ paths:
         '204':
           description: successful operation
 
-  '/video-channels-syncs/':
+  '/video-channel-syncs/':
     post:
       summary: Create a synchronization for a video channels
       operationId: addVideoChannelSync
@@ -3315,7 +3315,7 @@ paths:
                       id:
                         $ref: '#/components/schemas/id'
 
-  '/video-channels-syncs/{channelSyncId}':
+  '/video-channel-syncs/{channelSyncId}':
     delete:
       summary: Delete a video channel synchronization
       operationId: delVideoChannelSync
@@ -3329,7 +3329,7 @@ paths:
         '204':
           description: successful operation
 
-  '/video-channels-syncs/syncChannel/{channelSyncId}':
+  '/video-channel-syncs/syncChannel/{channelSyncId}':
     post:
       summary: Triggers the channel synchronization job, fetching all the videos from the remote channel
       operationId: triggerVideoChannelSync
@@ -3715,7 +3715,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/VideoChannelList'
 
-  '/accounts/{name}/video-channels-syncs':
+  '/accounts/{name}/video-channel-syncs':
     get:
       summary: List the synchronizations of video channels of an account
       tags: