From e379f813d45c4a83442aa13268d351e2605a7a01 Mon Sep 17 00:00:00 2001
From: Nassim Bounouas <NassimBounouas@users.noreply.github.com>
Date: Wed, 19 Jun 2019 14:57:39 +0200
Subject: [PATCH] Feature/completeUsernameCopy (#1913)

* #1843 Copy icon added to account page to copy Username

* #1843 Store an account name with the host forced and bind it to copy button

* #1843 tslint correction

* #1843 copy to clipboard replaced by ngx-clipboard
---
 client/src/app/+accounts/accounts.component.html | 7 +++++--
 client/src/app/shared/account/account.model.ts   | 2 ++
 client/src/app/shared/actor/actor.model.ts       | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 038e18c4b..1172f7ba7 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -7,8 +7,11 @@
       <div class="actor-info">
         <div class="actor-names">
           <div class="actor-display-name">{{ account.displayName }}</div>
-          <div class="actor-name">{{ account.nameWithHost }}</div>
-
+          <div class="actor-name">{{ account.nameWithHost }}
+          <button ngxClipboard [cbContent]="account.nameWithHostForced" type="button" class="btn btn-outline-secondary btn-sm">
+            <span class="glyphicon glyphicon-copy"></span>
+          </button>
+          </div>
           <span *ngIf="user?.blocked" [ngbTooltip]="user.blockedReason" class="badge badge-danger" i18n>Banned</span>
           <span *ngIf="account.mutedByUser" class="badge badge-danger" i18n>Muted</span>
           <span *ngIf="account.mutedServerByUser" class="badge badge-danger" i18n>Muted by your instance</span>
diff --git a/client/src/app/shared/account/account.model.ts b/client/src/app/shared/account/account.model.ts
index c5cd2051c..61f09fc06 100644
--- a/client/src/app/shared/account/account.model.ts
+++ b/client/src/app/shared/account/account.model.ts
@@ -5,6 +5,7 @@ export class Account extends Actor implements ServerAccount {
   displayName: string
   description: string
   nameWithHost: string
+  nameWithHostForced: string
   mutedByUser: boolean
   mutedByInstance: boolean
   mutedServerByUser: boolean
@@ -19,6 +20,7 @@ export class Account extends Actor implements ServerAccount {
     this.description = hash.description
     this.userId = hash.userId
     this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host)
+    this.nameWithHostForced = Actor.CREATE_BY_STRING(this.name, this.host, true)
 
     this.mutedByUser = false
     this.mutedByInstance = false
diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts
index 5a517c975..285f71ce0 100644
--- a/client/src/app/shared/actor/actor.model.ts
+++ b/client/src/app/shared/actor/actor.model.ts
@@ -23,11 +23,11 @@ export abstract class Actor implements ActorServer {
     return window.location.origin + '/client/assets/images/default-avatar.png'
   }
 
-  static CREATE_BY_STRING (accountName: string, host: string) {
+  static CREATE_BY_STRING (accountName: string, host: string, forceHostname = false) {
     const absoluteAPIUrl = getAbsoluteAPIUrl()
     const thisHost = new URL(absoluteAPIUrl).host
 
-    if (host.trim() === thisHost) return accountName
+    if (host.trim() === thisHost && !forceHostname) return accountName
 
     return accountName + '@' + host
   }
-- 
2.41.0