7 files changed, 59 insertions, 43 deletions

diff --git a/client/src/app/shared/form-validators/user-validators.ts b/client/src/app/shared/form-validators/user-validators.ts
index fee37e95f..976c97b87 100644
--- a/client/src/app/shared/form-validators/user-validators.ts
+++ b/client/src/app/shared/form-validators/user-validators.ts
@@ -1,12 +1,14 @@
 import { Validators } from '@angular/forms'
 import { BuildFormValidator } from './form-validator.model'
 
+export const USER_USERNAME_REGEX_CHARACTERS = '[a-z0-9][a-z0-9._]'
+
 export const USER_USERNAME_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [
     Validators.required,
     Validators.minLength(1),
     Validators.maxLength(50),
-    Validators.pattern(/^[a-z0-9][a-z0-9._]*$/)
+    Validators.pattern(new RegExp(`^${USER_USERNAME_REGEX_CHARACTERS}*$`))
   ],
   MESSAGES: {
     'required': $localize`Username is required.`,
diff --git a/client/src/app/shared/shared-main/account/actor.service.ts b/client/src/app/shared/shared-main/account/actor.service.ts
deleted file mode 100644
index 464ed4519..000000000
--- a/client/src/app/shared/shared-main/account/actor.service.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Observable, ReplaySubject } from 'rxjs'
-import { catchError, map, tap } from 'rxjs/operators'
-import { HttpClient } from '@angular/common/http'
-import { Injectable } from '@angular/core'
-import { RestExtractor } from '@app/core'
-import { Account as ServerAccount, VideoChannel as ServerVideoChannel } from '@shared/models'
-import { environment } from '../../../../environments/environment'
-
-type KeysOfUnion<T> = T extends T ? keyof T: never
-type ServerActor = KeysOfUnion<ServerAccount | ServerVideoChannel>
-
-@Injectable()
-export class ActorService {
-  static BASE_ACTOR_API_URL = environment.apiUrl + '/api/v1/actors/'
-
-  actorLoaded = new ReplaySubject<string>(1)
-
-  constructor (
-    private authHttp: HttpClient,
-    private restExtractor: RestExtractor
-  ) {}
-
-  getActorType (actorName: string): Observable<string> {
-    return this.authHttp.get<ServerActor>(ActorService.BASE_ACTOR_API_URL + actorName)
-                .pipe(
-                  map(actorHash => {
-                    if (actorHash[ 'userId' ]) {
-                      return 'Account'
-                    }
-
-                    return 'VideoChannel'
-                  }),
-                  tap(actor => this.actorLoaded.next(actor)),
-                  catchError(res => this.restExtractor.handleError(res))
-                )
-  }
-}
diff --git a/client/src/app/shared/shared-main/account/index.ts b/client/src/app/shared/shared-main/account/index.ts
index c6cdcd574..b80ddb9f5 100644
--- a/client/src/app/shared/shared-main/account/index.ts
+++ b/client/src/app/shared/shared-main/account/index.ts
@@ -1,4 +1,3 @@
 export * from './account.model'
 export * from './account.service'
 export * from './actor.model'
-export * from './actor.service'
diff --git a/client/src/app/shared/shared-main/index.ts b/client/src/app/shared/shared-main/index.ts
index a4d813c06..3a7fd4c34 100644
--- a/client/src/app/shared/shared-main/index.ts
+++ b/client/src/app/shared/shared-main/index.ts
@@ -5,6 +5,9 @@ export * from './date'
 export * from './feeds'
 export * from './loaders'
 export * from './misc'
+export * from './peertube-modal'
+export * from './plugins'
+export * from './router'
 export * from './users'
 export * from './video'
 export * from './video-caption'
diff --git a/client/src/app/shared/shared-main/router/actor-redirect-guard.service.ts b/client/src/app/shared/shared-main/router/actor-redirect-guard.service.ts
new file mode 100644
index 000000000..49d61f945
--- /dev/null
+++ b/client/src/app/shared/shared-main/router/actor-redirect-guard.service.ts
@@ -0,0 +1,46 @@
+import { forkJoin, of } from 'rxjs'
+import { catchError, map } from 'rxjs/operators'
+import { Injectable } from '@angular/core'
+import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'
+import { AccountService } from '../account'
+import { VideoChannelService } from '../video-channel'
+
+@Injectable()
+export class ActorRedirectGuard implements CanActivate {
+
+  constructor (
+    private router: Router,
+    private accountService: AccountService,
+    private channelService: VideoChannelService
+  ) {}
+
+  canActivate (route: ActivatedRouteSnapshot) {
+    const actorName = route.params.actorName
+
+    return forkJoin([
+      this.accountService.getAccount(actorName).pipe(this.orUndefined()),
+      this.channelService.getVideoChannel(actorName).pipe(this.orUndefined())
+    ]).pipe(
+      map(([ account, channel ]) => {
+        if (!account && !channel) {
+          this.router.navigate([ '/404' ])
+          return false
+        }
+
+        if (account) {
+          this.router.navigate([ `/a/${actorName}` ], { skipLocationChange: true })
+        }
+
+        if (channel) {
+          this.router.navigate([ `/c/${actorName}` ], { skipLocationChange: true })
+        }
+
+        return true
+      })
+    )
+  }
+
+  private orUndefined () {
+    return catchError(() => of(undefined))
+  }
+}
diff --git a/client/src/app/shared/shared-main/router/index.ts b/client/src/app/shared/shared-main/router/index.ts
new file mode 100644
index 000000000..f4000b674
--- /dev/null
+++ b/client/src/app/shared/shared-main/router/index.ts
@@ -0,0 +1 @@
+export * from './actor-redirect-guard.service'
diff --git a/client/src/app/shared/shared-main/shared-main.module.ts b/client/src/app/shared/shared-main/shared-main.module.ts
index f06f25ca5..c8dd01429 100644
--- a/client/src/app/shared/shared-main/shared-main.module.ts
+++ b/client/src/app/shared/shared-main/shared-main.module.ts
@@ -4,7 +4,7 @@ import { CommonModule, DatePipe } from '@angular/common'
 import { HttpClientModule } from '@angular/common/http'
 import { NgModule } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { RouterModule } from '@angular/router'
+import { ActivatedRouteSnapshot, RouterModule } from '@angular/router'
 import {
   NgbButtonsModule,
   NgbCollapseModule,
@@ -17,7 +17,7 @@ import {
 import { LoadingBarModule } from '@ngx-loading-bar/core'
 import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
 import { SharedGlobalIconModule } from '../shared-icons'
-import { AccountService, ActorService } from './account'
+import { AccountService } from './account'
 import {
   AutofocusDirective,
   BytesPipe,
@@ -39,6 +39,7 @@ import { UserHistoryService, UserNotificationsComponent, UserNotificationService
 import { RedundancyService, VideoImportService, VideoOwnershipService, VideoService } from './video'
 import { VideoCaptionService } from './video-caption'
 import { VideoChannelService } from './video-channel'
+import { ActorRedirectGuard } from './router'
 
 @NgModule({
   imports: [
@@ -161,7 +162,6 @@ import { VideoChannelService } from './video-channel'
     AUTH_INTERCEPTOR_PROVIDER,
 
     AccountService,
-    ActorService,
 
     UserHistoryService,
     UserNotificationService,
@@ -175,7 +175,9 @@ import { VideoChannelService } from './video-channel'
 
     VideoChannelService,
 
-    CustomPageService
+    CustomPageService,
+
+    ActorRedirectGuard
   ]
 })
 export class SharedMainModule { }