Merge remote-tracking branch 'origin' into feat-4596-edit-channel

diff --cc client/src/app/+video-channels/video-channels.component.html
Simple merge

diff --cc client/src/app/+video-channels/video-channels.component.ts
index c8a6cdd92be4f5054281be9b41c37719d9a646c5,ebb991f4ee3a4fd5f63e175b12efc5fc0f5681f5..1ed4f9bb70096b09667564fb471650684aef2ac4
--- 1/client/src/app/+video-channels/video-channels.component.ts
--- 2/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@@ -4,10 -4,11 +4,11 @@@ import { catchError, distinctUntilChang
  import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
  import { ActivatedRoute } from '@angular/router'
  import { AuthService, MarkdownService, Notifier, RestExtractor, ScreenService } from '@app/core'
- import { ListOverflowItem, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
+ import { Account, ListOverflowItem, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
+ import { BlocklistService } from '@app/shared/shared-moderation'
  import { SupportModalComponent } from '@app/shared/shared-support-modal'
  import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
 -import { HttpStatusCode } from '@shared/models'
 +import { HttpStatusCode, UserRight } from '@shared/models'
  
  @Component({
    templateUrl: './video-channels.component.html',

diff --cc client/src/app/+video-channels/video-channels.module.ts
index 26f89c68a2b66cd83ce980418ee6ba1804a3f518,76aaecf83b075c2f5228bb241392ad2020b3bd71..55f4a40d4474e14af3a7edc501d25c99ecbc1df9
--- 1/client/src/app/+video-channels/video-channels.module.ts
--- 2/client/src/app/+video-channels/video-channels.module.ts
+++ b/client/src/app/+video-channels/video-channels.module.ts
@@@ -10,10 -12,6 +12,9 @@@ import { VideoChannelPlaylistsComponen
  import { VideoChannelVideosComponent } from './video-channel-videos/video-channel-videos.component'
  import { VideoChannelsRoutingModule } from './video-channels-routing.module'
  import { VideoChannelsComponent } from './video-channels.component'
- import { SharedActorImageModule } from '../shared/shared-actor-image/shared-actor-image.module'
 +import { MyVideoChannelCreateComponent } from './video-channel-edit/video-channel-create.component'
 +import { VideoChannelUpdateComponent } from './video-channel-edit/video-channel-update.component'
 +import { SharedActorImageEditModule } from '@app/shared/shared-actor-image-edit'
  
  @NgModule({
    imports: [
@@@ -27,7 -25,7 +28,8 @@@
      SharedGlobalIconModule,
      SharedSupportModal,
      SharedActorImageModule,
-     SharedActorImageEditModule
++    SharedActorImageEditModule,
+     SharedModerationModule
    ],
  
    declarations: [