From 4edee628a0a154360b30eab48924b3987ac90798 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 22 Feb 2022 11:25:03 +0100
Subject: Improve account removal message for users

---
 .../my-account-danger-zone/my-account-danger-zone.component.ts |  9 +++++++--
 client/src/app/modal/confirm.component.ts                      | 10 ++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'client/src')

diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
index 4a46f1ad9..2bae3499e 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
@@ -19,8 +19,13 @@ export class MyAccountDangerZoneComponent {
 
   async deleteMe () {
     const res = await this.confirmService.confirmWithInput(
-      // eslint-disable-next-line max-len
-      $localize`Are you sure you want to delete your account? This will delete all your data, including channels, videos and comments. Content cached by other servers and other third-parties might make longer to be deleted.`,
+      $localize`Are you sure you want to delete your account?` +
+        '<br /><br />' +
+        // eslint-disable-next-line max-len
+        $localize`This will delete all your data, including channels, videos, comments and you won't be able to create another user on this instance with "${this.user.username}" username.` +
+        '<br /><br />' +
+        $localize`Content cached by other servers and other third-parties might make longer to be deleted.`,
+
       $localize`Type your username to confirm`,
       this.user.username,
       $localize`Delete your account`,
diff --git a/client/src/app/modal/confirm.component.ts b/client/src/app/modal/confirm.component.ts
index 457dd1f3f..ec4e1d60f 100644
--- a/client/src/app/modal/confirm.component.ts
+++ b/client/src/app/modal/confirm.component.ts
@@ -1,4 +1,5 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
+import { HtmlRendererService } from '@app/core'
 import { ConfirmService } from '@app/core/confirm/confirm.service'
 import { POP_STATE_MODAL_DISMISS } from '@app/helpers'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -24,6 +25,7 @@ export class ConfirmComponent implements OnInit {
 
   constructor (
     private modalService: NgbModal,
+    private html: HtmlRendererService,
     private confirmService: ConfirmService
   ) { }
 
@@ -31,14 +33,18 @@ export class ConfirmComponent implements OnInit {
     this.confirmService.showConfirm.subscribe(
       ({ title, message, expectedInputValue, inputLabel, confirmButtonText }) => {
         this.title = title
-        this.message = message
 
         this.inputLabel = inputLabel
         this.expectedInputValue = expectedInputValue
 
         this.confirmButtonText = confirmButtonText || $localize`Confirm`
 
-        this.showModal()
+        this.html.toSafeHtml(message)
+          .then(message => {
+            this.message = message
+
+            this.showModal()
+          })
       }
     )
   }
-- 
cgit v1.2.3