1 files changed, 78 insertions, 33 deletions

diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index e6a5a5d5e..a00063129 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -2,11 +2,19 @@ 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 { AuthService, Notifier, RedirectService, RestExtractor, ScreenService, UserService } from '@app/core'
-import { Account, AccountService, DropdownAction, ListOverflowItem, VideoChannel, VideoChannelService } from '@app/shared/shared-main'
+import { AuthService, MarkdownService, Notifier, RedirectService, RestExtractor, ScreenService, UserService } from '@app/core'
+import {
+  Account,
+  AccountService,
+  DropdownAction,
+  ListOverflowItem,
+  VideoChannel,
+  VideoChannelService,
+  VideoService
+} from '@app/shared/shared-main'
 import { AccountReportComponent } from '@app/shared/shared-moderation'
-import { User, UserRight } from '@shared/models'
 import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
+import { User, UserRight } from '@shared/models'
 import { AccountSearchComponent } from './account-search/account-search.component'
 
 @Component({
@@ -15,16 +23,23 @@ import { AccountSearchComponent } from './account-search/account-search.componen
 })
 export class AccountsComponent implements OnInit, OnDestroy {
   @ViewChild('accountReportModal') accountReportModal: AccountReportComponent
+
   accountSearch: AccountSearchComponent
 
   account: Account
   accountUser: User
+
   videoChannels: VideoChannel[] = []
+
   links: ListOverflowItem[] = []
+  hideMenu = false
 
-  isAccountManageable = false
   accountFollowerTitle = ''
 
+  accountVideosCount: number
+  accountDescriptionHTML = ''
+  accountDescriptionExpanded = false
+
   prependModerationActions: DropdownAction<any>[]
 
   private routeSub: Subscription
@@ -38,6 +53,8 @@ export class AccountsComponent implements OnInit, OnDestroy {
     private restExtractor: RestExtractor,
     private redirectService: RedirectService,
     private authService: AuthService,
+    private videoService: VideoService,
+    private markdown: MarkdownService,
     private screenService: ScreenService
   ) {
   }
@@ -63,8 +80,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
 
     this.links = [
       { label: $localize`VIDEO CHANNELS`, routerLink: 'video-channels' },
-      { label: $localize`VIDEOS`, routerLink: 'videos' },
-      { label: $localize`ABOUT`, routerLink: 'about' }
+      { label: $localize`VIDEOS`, routerLink: 'videos' }
     ]
   }
 
@@ -72,19 +88,29 @@ export class AccountsComponent implements OnInit, OnDestroy {
     if (this.routeSub) this.routeSub.unsubscribe()
   }
 
-  get naiveAggregatedSubscribers () {
+  naiveAggregatedSubscribers () {
     return this.videoChannels.reduce(
       (acc, val) => acc + val.followersCount,
       this.account.followersCount // accumulator starts with the base number of subscribers the account has
     )
   }
 
-  get isInSmallView () {
+  isUserLoggedIn () {
+    return this.authService.isLoggedIn()
+  }
+
+  isInSmallView () {
     return this.screenService.isInSmallView()
   }
 
+  isManageable () {
+    if (!this.isUserLoggedIn()) return false
+
+    return this.account?.userId === this.authService.getUser().id
+  }
+
   onUserChanged () {
-    this.getUserIfNeeded(this.account)
+    this.loadUserIfNeeded(this.account)
   }
 
   onUserDeleted () {
@@ -113,40 +139,30 @@ export class AccountsComponent implements OnInit, OnDestroy {
     if (this.accountSearch) this.accountSearch.updateSearch(search)
   }
 
-  private onAccount (account: Account) {
+  onSearchInputDisplayChanged (displayed: boolean) {
+    this.hideMenu = this.isInSmallView() && displayed
+  }
+
+  private async onAccount (account: Account) {
+    this.accountFollowerTitle = $localize`${account.followersCount} direct account followers`
+
     this.prependModerationActions = undefined
 
-    this.account = account
+    this.accountDescriptionHTML = await this.markdown.textMarkdownToHTML(account.description)
 
-    if (this.authService.isLoggedIn()) {
-      this.authService.userInformationLoaded.subscribe(
-        () => {
-          this.isAccountManageable = this.account.userId && this.account.userId === this.authService.getUser().id
-
-          const followers = this.subscribersDisplayFor(account.followersCount)
-          this.accountFollowerTitle = $localize`${followers} direct account followers`
-
-          // It's not our account, we can report it
-          if (!this.isAccountManageable) {
-            this.prependModerationActions = [
-              {
-                label: $localize`Report this account`,
-                handler: () => this.showReportModal()
-              }
-            ]
-          }
-        }
-      )
-    }
+    // After the markdown renderer to avoid layout changes
+    this.account = account
 
-    this.getUserIfNeeded(account)
+    this.updateModerationActions()
+    this.loadUserIfNeeded(account)
+    this.loadAccountVideosCount()
   }
 
   private showReportModal () {
     this.accountReportModal.show()
   }
 
-  private getUserIfNeeded (account: Account) {
+  private loadUserIfNeeded (account: Account) {
     if (!account.userId || !this.authService.isLoggedIn()) return
 
     const user = this.authService.getUser()
@@ -158,4 +174,33 @@ export class AccountsComponent implements OnInit, OnDestroy {
       )
     }
   }
+
+  private updateModerationActions () {
+    if (!this.authService.isLoggedIn()) return
+
+    this.authService.userInformationLoaded.subscribe(
+      () => {
+        if (this.isManageable()) return
+
+        // It's not our account, we can report it
+        this.prependModerationActions = [
+          {
+            label: $localize`Report this account`,
+            handler: () => this.showReportModal()
+          }
+        ]
+      }
+    )
+  }
+
+  private loadAccountVideosCount () {
+    this.videoService.getAccountVideos({
+      account: this.account,
+      videoPagination: {
+        currentPage: 1,
+        itemsPerPage: 0
+      },
+      sort: '-publishedAt'
+    }).subscribe(res => this.accountVideosCount = res.total)
+  }
 }