Add video channel account list

client/src/app/+account/account-routing.module.ts

@@ -3,7 +3,8 @@ import { RouterModule, Routes } from '@angular/router'
 import { MetaGuard } from '@ngx-meta/core'
 import { AccountComponent } from './account.component'
 import { AccountVideosComponent } from './account-videos/account-videos.component'
-import { AccountAboutComponent } from '@app/+account/account-about/account-about.component'
+import { AccountAboutComponent } from './account-about/account-about.component'
+import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
 
 const accountRoutes: Routes = [
   {
@@ -25,6 +26,15 @@ const accountRoutes: Routes = [
           }
         }
       },
+      {
+        path: 'video-channels',
+        component: AccountVideoChannelsComponent,
+        data: {
+          meta: {
+            title: 'Account video channels'
+          }
+        }
+      },
       {
         path: 'about',
         component: AccountAboutComponent,

client/src/app/+account/account-video-channels/account-video-channels.component.html

@@ -0,0 +1,11 @@
+<div *ngIf="account" class="row">
+  <a
+    *ngFor="let videoChannel of videoChannels" [routerLink]="[ '/video-channels', videoChannel.uuid ]"
+    class="video-channel" title="See this video channel"
+  >
+    <img [src]="videoChannel.avatarUrl" alt="Avatar" />
+
+    <div class="video-channel-display-name">{{ videoChannel.displayName }}</div>
+    <div class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div>
+  </a>
+</div>

client/src/app/+account/account-video-channels/account-video-channels.component.scss

@@ -0,0 +1,30 @@
+@import '_variables';
+@import '_mixins';
+
+.row {
+  text-align: center;
+}
+
+a.video-channel {
+  @include disable-default-a-behaviour;
+
+  display: inline-block;
+  text-align: center;
+  color: #000;
+  margin: 10px 30px;
+
+  img {
+    @include avatar(80px);
+
+    margin-bottom: 10px;
+  }
+
+  .video-channel-display-name {
+    font-size: 20px;
+    font-weight: $font-bold;
+  }
+
+  .video-channel-followers {
+    font-size: 15px;
+  }
+}

client/src/app/+account/account-video-channels/account-video-channels.component.ts

@@ -0,0 +1,33 @@
+import { Component, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import 'rxjs/add/observable/from'
+import 'rxjs/add/operator/concatAll'
+import { Account } from '@app/shared/account/account.model'
+import { AccountService } from '@app/shared/account/account.service'
+import { VideoChannel } from '../../../../../shared/models/videos'
+import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
+
+@Component({
+  selector: 'my-account-video-channels',
+  templateUrl: './account-video-channels.component.html',
+  styleUrls: [ './account-video-channels.component.scss' ]
+})
+export class AccountVideoChannelsComponent implements OnInit {
+  account: Account
+  videoChannels: VideoChannel[] = []
+
+  constructor (
+    protected route: ActivatedRoute,
+    private accountService: AccountService,
+    private videoChannelService: VideoChannelService
+  ) { }
+
+  ngOnInit () {
+    // Parent get the account for us
+    this.accountService.accountLoaded
+        .do(account => this.account = account)
+        .flatMap(account => this.videoChannelService.getVideoChannels(account.id))
+        .map(res => res.data)
+        .subscribe(videoChannels => this.videoChannels = videoChannels)
+  }
+}

client/src/app/+account/account.component.html

@@ -2,7 +2,7 @@
   <div class="sub-menu">
 
     <div class="account">
-      <img [src]="getAvatarUrl()" alt="Avatar" />
+      <img [src]="account.avatarUrl" alt="Avatar" />
 
       <div class="account-info">
         <div class="account-display-name">{{ account.displayName }}</div>
@@ -13,6 +13,8 @@
     <div class="links">
       <a routerLink="videos" routerLinkActive="active" class="title-page">Videos</a>
 
+      <a routerLink="video-channels" routerLinkActive="active" class="title-page">Video channels</a>
+
       <a routerLink="about" routerLinkActive="active" class="title-page">About</a>
     </div>
   </div>

client/src/app/+account/account.component.ts

@@ -22,8 +22,4 @@ export class AccountComponent implements OnInit {
     this.accountService.getAccount(accountId)
         .subscribe(account => this.account = account)
   }
-
-  getAvatarUrl () {
-    return Account.GET_ACCOUNT_AVATAR_URL(this.account)
-  }
 }

client/src/app/+account/account.module.ts

@@ -4,6 +4,7 @@ import { AccountRoutingModule } from './account-routing.module'
 import { AccountComponent } from './account.component'
 import { AccountVideosComponent } from './account-videos/account-videos.component'
 import { AccountAboutComponent } from './account-about/account-about.component'
+import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
 
 @NgModule({
   imports: [
@@ -14,6 +15,7 @@ import { AccountAboutComponent } from './account-about/account-about.component'
   declarations: [
     AccountComponent,
     AccountVideosComponent,
+    AccountVideoChannelsComponent,
     AccountAboutComponent
   ],
 

client/src/app/menu/menu.component.html

@@ -1,7 +1,7 @@
 <menu>
   <div *ngIf="isLoggedIn" class="logged-in-block">
     <a routerLink="/account/settings">
-      <img [src]="getUserAvatarUrl()" alt="Avatar" />
+      <img [src]="user.accountAvatarUrl" alt="Avatar" />
     </a>
 
     <div class="logged-in-info">

client/src/app/menu/menu.component.ts

@@ -51,10 +51,6 @@ export class MenuComponent implements OnInit {
     )
   }
 
-  getUserAvatarUrl () {
-    return this.user.getAvatarUrl()
-  }
-
   isRegistrationAllowed () {
     return this.serverService.getConfig().signup.allowed
   }

client/src/app/my-account/my-account-settings/my-account-settings.component.html

@@ -1,5 +1,5 @@
 <div class="user">
-  <img [src]="getAvatarUrl()" alt="Avatar" />
+  <img [src]="user.accountAvatarUrl" alt="Avatar" />
 
   <div class="user-info">
     <div class="user-info-username">{{ user.username }}</div>

client/src/app/my-account/my-account-settings/my-account-settings.component.ts

@@ -42,10 +42,6 @@ export class MyAccountSettingsComponent implements OnInit {
       .subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed)
   }
 
-  getAvatarUrl () {
-    return this.user.getAvatarUrl()
-  }
-
   changeAvatar () {
     const avatarfile = this.avatarfileInput.nativeElement.files[ 0 ]
 

client/src/app/shared/account/account.model.ts

@@ -1,50 +1,14 @@
 import { Account as ServerAccount } from '../../../../../shared/models/actors/account.model'
-import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
+import { Actor } from '../actor/actor.model'
-import { getAbsoluteAPIUrl } from '../misc/utils'
 
-export class Account implements ServerAccount {
+export class Account extends Actor implements ServerAccount {
-  id: number
-  uuid: string
-  url: string
-  name: string
   displayName: string
   description: string
-  host: string
-  followingCount: number
-  followersCount: number
-  createdAt: Date
-  updatedAt: Date
-  avatar: Avatar
-
-  static GET_ACCOUNT_AVATAR_URL (account: Account) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
-
-    if (account && account.avatar) return absoluteAPIUrl + account.avatar.path
-
-    return window.location.origin + '/client/assets/images/default-avatar.png'
-  }
-
-  static CREATE_BY_STRING (accountName: string, host: string) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
-    const thisHost = new URL(absoluteAPIUrl).host
-
-    if (host.trim() === thisHost) return accountName
-
-    return accountName + '@' + host
-  }
 
   constructor (hash: ServerAccount) {
-    this.id = hash.id
+    super(hash)
-    this.uuid = hash.uuid
+
-    this.url = hash.url
-    this.name = hash.name
     this.displayName = hash.displayName
     this.description = hash.description
-    this.host = hash.host
-    this.followingCount = hash.followingCount
-    this.followersCount = hash.followersCount
-    this.createdAt = new Date(hash.createdAt.toString())
-    this.updatedAt = new Date(hash.updatedAt.toString())
-    this.avatar = hash.avatar
   }
 }

client/src/app/shared/actor/actor.model.ts

@@ -0,0 +1,50 @@
+import { Actor as ActorServer } from '../../../../../shared/models/actors/actor.model'
+import { getAbsoluteAPIUrl } from '@app/shared/misc/utils'
+import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
+
+export abstract class Actor implements ActorServer {
+  id: number
+  uuid: string
+  url: string
+  name: string
+  host: string
+  followingCount: number
+  followersCount: number
+  createdAt: Date
+  updatedAt: Date
+  avatar: Avatar
+
+  avatarUrl: string
+
+  static GET_ACTOR_AVATAR_URL (actor: { avatar: Avatar }) {
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
+
+    if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path
+
+    return window.location.origin + '/client/assets/images/default-avatar.png'
+  }
+
+  static CREATE_BY_STRING (accountName: string, host: string) {
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
+    const thisHost = new URL(absoluteAPIUrl).host
+
+    if (host.trim() === thisHost) return accountName
+
+    return accountName + '@' + host
+  }
+
+  protected constructor (hash: ActorServer) {
+    this.id = hash.id
+    this.uuid = hash.uuid
+    this.url = hash.url
+    this.name = hash.name
+    this.host = hash.host
+    this.followingCount = hash.followingCount
+    this.followersCount = hash.followersCount
+    this.createdAt = new Date(hash.createdAt.toString())
+    this.updatedAt = new Date(hash.updatedAt.toString())
+    this.avatar = hash.avatar
+
+    this.avatarUrl = Actor.GET_ACTOR_AVATAR_URL(this)
+  }
+}

client/src/app/shared/shared.module.ts

@@ -32,6 +32,7 @@ import { VideoFeedComponent } from './video/video-feed.component'
 import { VideoThumbnailComponent } from './video/video-thumbnail.component'
 import { VideoService } from './video/video.service'
 import { AccountService } from '@app/shared/account/account.service'
+import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
 
 @NgModule({
   imports: [
@@ -106,7 +107,8 @@ import { AccountService } from '@app/shared/account/account.service'
     UserService,
     VideoService,
     AccountService,
-    MarkdownService
+    MarkdownService,
+    VideoChannelService
   ]
 })
 export class SharedModule { }

client/src/app/shared/users/user.model.ts

@@ -1,6 +1,6 @@
-import { hasUserRight, User as UserServerModel, UserRight, UserRole, VideoChannel } from '../../../../../shared'
+import { Account, hasUserRight, User as UserServerModel, UserRight, UserRole, VideoChannel } from '../../../../../shared'
-import { Account } from '../account/account.model'
 import { NSFWPolicyType } from '../../../../../shared/models/videos/nsfw-policy.type'
+import { Actor } from '@app/shared/actor/actor.model'
 
 export type UserConstructorHash = {
   id: number,
@@ -25,6 +25,7 @@ export class User implements UserServerModel {
   account: Account
   videoChannels: VideoChannel[]
   createdAt: Date
+  accountAvatarUrl: string
 
   constructor (hash: UserConstructorHash) {
     this.id = hash.id
@@ -52,19 +53,23 @@ export class User implements UserServerModel {
     if (hash.createdAt !== undefined) {
       this.createdAt = hash.createdAt
     }
+
+    this.updateComputedAttributes()
   }
 
   hasRight (right: UserRight) {
     return hasUserRight(this.role, right)
   }
 
-  getAvatarUrl () {
-    return Account.GET_ACCOUNT_AVATAR_URL(this.account)
-  }
-
   patch (obj: UserServerModel) {
     for (const key of Object.keys(obj)) {
       this[key] = obj[key]
     }
+
+    this.updateComputedAttributes()
+  }
+
+  private updateComputedAttributes () {
+    this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account)
   }
 }

client/src/app/shared/video-channel/video-channel.model.ts

@@ -0,0 +1,23 @@
+import { VideoChannel as ServerVideoChannel } from '../../../../../shared/models/videos/video-channel.model'
+import { Actor } from '../actor/actor.model'
+
+export class VideoChannel extends Actor implements ServerVideoChannel {
+  displayName: string
+  description: string
+  support: string
+  isLocal: boolean
+  ownerAccount?: {
+    id: number
+    uuid: string
+  }
+
+  constructor (hash: ServerVideoChannel) {
+    super(hash)
+
+    this.displayName = hash.displayName
+    this.description = hash.description
+    this.support = hash.support
+    this.isLocal = hash.isLocal
+    this.ownerAccount = hash.ownerAccount
+  }
+}

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

@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core'
+import 'rxjs/add/operator/catch'
+import 'rxjs/add/operator/map'
+import { Observable } from 'rxjs/Observable'
+import { RestExtractor } from '../rest/rest-extractor.service'
+import { RestService } from '../rest/rest.service'
+import { HttpClient } from '@angular/common/http'
+import { VideoChannel as VideoChannelServer } from '../../../../../shared/models/videos'
+import { AccountService } from '../account/account.service'
+import { ResultList } from '../../../../../shared'
+import { VideoChannel } from './video-channel.model'
+
+@Injectable()
+export class VideoChannelService {
+  constructor (
+    private authHttp: HttpClient,
+    private restExtractor: RestExtractor,
+    private restService: RestService
+  ) {}
+
+  getVideoChannels (accountId: number): Observable<ResultList<VideoChannel>> {
+    return this.authHttp.get<ResultList<VideoChannelServer>>(AccountService.BASE_ACCOUNT_URL + accountId + '/video-channels')
+               .map(res => this.extractVideoChannels(res))
+               .catch((res) => this.restExtractor.handleError(res))
+  }
+
+  private extractVideoChannels (result: ResultList<VideoChannelServer>) {
+    const videoChannels: VideoChannel[] = []
+
+    for (const videoChannelJSON of result.data) {
+      videoChannels.push(new VideoChannel(videoChannelJSON))
+    }
+
+    return { data: videoChannels, total: result.total }
+  }
+}

client/src/app/shared/video/video.model.ts

@@ -1,13 +1,14 @@
-import { Account } from '@app/shared/account/account.model'
 import { User } from '../'
 import { Video as VideoServerModel, VideoPrivacy } from '../../../../../shared'
 import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
 import { VideoConstant } from '../../../../../shared/models/videos/video.model'
 import { getAbsoluteAPIUrl } from '../misc/utils'
 import { ServerConfig } from '../../../../../shared/models'
+import { Actor } from '@app/shared/actor/actor.model'
 
 export class Video implements VideoServerModel {
   by: string
+  accountAvatarUrl: string
   createdAt: Date
   updatedAt: Date
   publishedAt: Date
@@ -85,7 +86,8 @@ export class Video implements VideoServerModel {
     this.nsfw = hash.nsfw
     this.account = hash.account
 
-    this.by = Account.CREATE_BY_STRING(hash.account.name, hash.account.host)
+    this.by = Actor.CREATE_BY_STRING(hash.account.name, hash.account.host)
+    this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account)
   }
 
   isVideoNSFWForUser (user: User, serverConfig: ServerConfig) {

client/src/app/videos/+video-watch/comment/video-comment-add.component.html

@@ -1,6 +1,6 @@
 <form novalidate [formGroup]="form" (ngSubmit)="formValidated()">
   <div class="avatar-and-textarea">
-    <img [src]="getUserAvatarUrl()" alt="Avatar" />
+    <img [src]="user.accountAvatarUrl" alt="Avatar" />
 
     <div class="form-group">
       <textarea placeholder="Add comment..." formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"

client/src/app/videos/+video-watch/comment/video-comment-add.component.ts

@@ -100,10 +100,6 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
     return this.form.value['text']
   }
 
-  getUserAvatarUrl () {
-    return this.user.getAvatarUrl()
-  }
-
   private addCommentReply (commentCreate: VideoCommentCreate) {
     return this.videoCommentService
       .addCommentReply(this.video.id, this.parentComment.id, commentCreate)

client/src/app/videos/+video-watch/comment/video-comment.component.html

@@ -1,5 +1,5 @@
 <div class="root-comment">
-  <img [src]="getAvatarUrl(comment.account)" alt="Avatar" />
+  <img [src]="comment.accountAvatarUrl" alt="Avatar" />
 
   <div class="comment">
     <div *ngIf="highlightedComment === true" class="highlighted-comment">Highlighted comment</div>

client/src/app/videos/+video-watch/comment/video-comment.component.ts

@@ -1,11 +1,9 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service'
 import * as sanitizeHtml from 'sanitize-html'
-import { Account as AccountInterface } from '../../../../../../shared/models/actors'
 import { UserRight } from '../../../../../../shared/models/users'
 import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
 import { AuthService } from '../../../core/auth'
-import { Account } from '../../../shared/account/account.model'
 import { Video } from '../../../shared/video/video.model'
 import { VideoComment } from './video-comment.model'
 
@@ -80,10 +78,6 @@ export class VideoCommentComponent implements OnInit, OnChanges {
     this.resetReply.emit()
   }
 
-  getAvatarUrl (account: AccountInterface) {
-    return Account.GET_ACCOUNT_AVATAR_URL(account)
-  }
-
   isRemovableByUser () {
     return this.isUserLoggedIn() &&
       (

client/src/app/videos/+video-watch/comment/video-comment.model.ts

@@ -1,6 +1,6 @@
-import { Account } from '@app/shared/account/account.model'
 import { Account as AccountInterface } from '../../../../../../shared/models/actors'
 import { VideoComment as VideoCommentServerModel } from '../../../../../../shared/models/videos/video-comment.model'
+import { Actor } from '@app/shared/actor/actor.model'
 
 export class VideoComment implements VideoCommentServerModel {
   id: number
@@ -14,6 +14,7 @@ export class VideoComment implements VideoCommentServerModel {
   account: AccountInterface
   totalReplies: number
   by: string
+  accountAvatarUrl
 
   constructor (hash: VideoCommentServerModel) {
     this.id = hash.id
@@ -27,6 +28,7 @@ export class VideoComment implements VideoCommentServerModel {
     this.account = hash.account
     this.totalReplies = hash.totalReplies
 
-    this.by = Account.CREATE_BY_STRING(this.account.name, this.account.host)
+    this.by = Actor.CREATE_BY_STRING(this.account.name, this.account.host)
+    this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account)
   }
 }

client/src/app/videos/+video-watch/video-watch.component.html

@@ -24,7 +24,7 @@
           <div class="video-info-by">
             <a [routerLink]="[ '/account', video.account.id ]" title="Go the account page">
               <span>By {{ video.by }}</span>
-              <img [src]="getAvatarPath()" alt="Account avatar" />
+              <img [src]="video.accountAvatarUrl" alt="Account avatar" />
             </a>
           </div>
         </div>

client/src/app/videos/+video-watch/video-watch.component.ts

@@ -228,10 +228,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return this.video.isBlackistableBy(this.user)
   }
 
-  getAvatarPath () {
-    return Account.GET_ACCOUNT_AVATAR_URL(this.video.account)
-  }
-
   getVideoPoster () {
     if (!this.video) return ''