1 files changed, 9 insertions, 13 deletions

diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index 733cff8d5..e90816c5a 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -1,7 +1,7 @@
 import { Subscription } from 'rxjs'
 import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, MarkdownService, Notifier, RedirectService, RestExtractor, ScreenService, UserService } from '@app/core'
 import {
   Account,
@@ -14,7 +14,6 @@ import {
 } from '@app/shared/shared-main'
 import { AccountReportComponent } from '@app/shared/shared-moderation'
 import { HttpStatusCode, User, UserRight } from '@shared/models'
-import { AccountSearchComponent } from './account-search/account-search.component'
 
 @Component({
   templateUrl: './accounts.component.html',
@@ -23,8 +22,6 @@ import { AccountSearchComponent } from './account-search/account-search.componen
 export class AccountsComponent implements OnInit, OnDestroy {
   @ViewChild('accountReportModal') accountReportModal: AccountReportComponent
 
-  accountSearch: AccountSearchComponent
-
   account: Account
   accountUser: User
 
@@ -45,6 +42,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
 
   constructor (
     private route: ActivatedRoute,
+    private router: Router,
     private userService: UserService,
     private accountService: AccountService,
     private videoChannelService: VideoChannelService,
@@ -128,16 +126,10 @@ export class AccountsComponent implements OnInit, OnDestroy {
     return $localize`${count} subscribers`
   }
 
-  onOutletLoaded (component: Component) {
-    if (component instanceof AccountSearchComponent) {
-      this.accountSearch = component
-    } else {
-      this.accountSearch = undefined
-    }
-  }
-
   searchChanged (search: string) {
-    if (this.accountSearch) this.accountSearch.updateSearch(search)
+    const queryParams = { search }
+
+    this.router.navigate([ './videos' ], { queryParams, relativeTo: this.route, queryParamsHandling: 'merge' })
   }
 
   onSearchInputDisplayChanged (displayed: boolean) {
@@ -152,6 +144,10 @@ export class AccountsComponent implements OnInit, OnDestroy {
     return !this.accountDescriptionExpanded && this.accountDescriptionHTML.length > 100
   }
 
+  isOnChannelPage () {
+    return this.route.children[0].snapshot.url[0].path === 'video-channels'
+  }
+
   private async onAccount (account: Account) {
     this.accountFollowerTitle = $localize`${account.followersCount} direct account followers`