X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2F%2Babout%2Fabout-instance%2Fabout-instance.component.ts;h=0826bbc5a198bfb59c0b50b0a1ab48b9fdf9e6f2;hb=9df52d660feb722404be00a50f3c8a612bec1c15;hp=2e09964292d88b2e2e1877d200168368d07dff1a;hpb=8ee25e17b88b970703f4df9e74cb4726bbffd837;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts
index 2e0996429..0826bbc5a 100644
--- a/client/src/app/+about/about-instance/about-instance.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -1,13 +1,12 @@
 import { ViewportScroller } from '@angular/common'
 import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component'
-import { Notifier } from '@app/core'
-import { CustomMarkupService } from '@app/shared/shared-custom-markup'
+import { Notifier, ServerService } from '@app/core'
 import { InstanceService } from '@app/shared/shared-instance'
-import { About, ServerConfig } from '@shared/models'
-import { copyToClipboard } from '../../../root-helpers/utils'
+import { copyToClipboard } from '@root-helpers/utils'
+import { HTMLServerConfig } from '@shared/models/server'
 import { ResolverData } from './about-instance.resolver'
+import { ContactAdminModalComponent } from './contact-admin-modal.component'
 
 @Component({
   selector: 'my-about-instance',
@@ -35,17 +34,17 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
   languages: string[] = []
   categories: string[] = []
 
-  serverConfig: ServerConfig
-
   initialized = false
 
+  private serverConfig: HTMLServerConfig
+
   private lastScrollHash: string
 
   constructor (
-    private customMarkupService: CustomMarkupService,
     private viewportScroller: ViewportScroller,
     private route: ActivatedRoute,
     private notifier: Notifier,
+    private serverService: ServerService,
     private instanceService: InstanceService
   ) {}
 
@@ -62,9 +61,17 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
   }
 
   async ngOnInit () {
-    const { about, languages, categories, serverConfig }: ResolverData = this.route.snapshot.data.instanceData
+    const { about, languages, categories }: ResolverData = this.route.snapshot.data.instanceData
+
+    this.serverConfig = this.serverService.getHTMLConfig()
 
-    this.serverConfig = serverConfig
+    this.route.data.subscribe(data => {
+      if (!data?.isContact) return
+
+      const prefill = this.route.snapshot.queryParams
+
+      this.contactAdminModal.show(prefill)
+    })
 
     this.languages = languages
     this.categories = categories
@@ -74,8 +81,6 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
 
     this.html = await this.instanceService.buildHtml(about)
 
-    await this.injectDescription(about)
-
     this.initialized = true
   }
 
@@ -87,19 +92,9 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
     }
   }
 
-  openContactModal () {
-    return this.contactAdminModal.show()
-  }
-
   onClickCopyLink (anchor: HTMLAnchorElement) {
     const link = anchor.href
     copyToClipboard(link)
-    this.notifier.success(link, $localize `Link copied`)
-  }
-
-  private async injectDescription (about: About) {
-    const element = await this.customMarkupService.buildElement(about.instance.description)
-
-    this.descriptionWrapper.nativeElement.appendChild(element)
+    this.notifier.success(link, $localize`Link copied`)
   }
 }