From 6ab3fc1bd80bba1ab7bc3cae6129472ed356b720 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Mon, 24 Feb 2020 20:21:07 -0500
Subject: [PATCH 1/4] trim instance name, fix #225

---
 .../add-new-account/add-new-account.component.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/floating-column/add-new-account/add-new-account.component.ts b/src/app/components/floating-column/add-new-account/add-new-account.component.ts
index d46514b2..064ad8af 100644
--- a/src/app/components/floating-column/add-new-account/add-new-account.component.ts
+++ b/src/app/components/floating-column/add-new-account/add-new-account.component.ts
@@ -22,7 +22,7 @@ export class AddNewAccountComponent implements OnInit {
     private instance: string;
     @Input()
     set setInstance(value: string) {
-        this.instance = value;
+        this.instance = value.trim();
         this.checkComrad();
     }
     get setInstance(): string {

From 6a2ec8bd23d7769b2602f8dd37c64e0d310a42f0 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Mon, 24 Feb 2020 20:32:30 -0500
Subject: [PATCH 2/4] add emoji support in CW, fix #220

---
 src/app/components/stream/status/status.component.html | 2 +-
 src/app/components/stream/status/status.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/stream/status/status.component.html b/src/app/components/stream/status/status.component.html
index 87d8af14..d9463266 100644
--- a/src/app/components/stream/status/status.component.html
+++ b/src/app/components/stream/status/status.component.html
@@ -92,7 +92,7 @@
             <a href class="status__content-warning" *ngIf="isContentWarned" title="show content"
                 (click)="removeContentWarning()">
                 <span class="status__content-warning--title">sensitive content</span>
-                {{ contentWarningText }}
+                <span innerHTML="{{ contentWarningText }}"></span>
             </a>
             <app-databinded-text class="status__content" *ngIf="!isContentWarned" [text]="statusContent"
                 (accountSelected)="accountSelected($event)" (hashtagSelected)="hashtagSelected($event)"
diff --git a/src/app/components/stream/status/status.component.ts b/src/app/components/stream/status/status.component.ts
index 791a6b03..7416104b 100644
--- a/src/app/components/stream/status/status.component.ts
+++ b/src/app/components/stream/status/status.component.ts
@@ -97,7 +97,7 @@ export class StatusComponent implements OnInit {
     private checkContentWarning(status: Status) {
         if (status.sensitive || status.spoiler_text) {
             this.isContentWarned = true;
-            this.contentWarningText = status.spoiler_text;
+            this.contentWarningText =  this.emojiConverter.applyEmojis(this.displayedStatus.emojis, status.spoiler_text, EmojiTypeEnum.medium);
         }
     }
 

From 5731962603a5a4134cd4c2d23186622e23804950 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Mon, 24 Feb 2020 20:42:18 -0500
Subject: [PATCH 3/4] clean pleroma account's fields url, fix #200

---
 .../stream/user-profile/user-profile.component.ts  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/app/components/stream/user-profile/user-profile.component.ts b/src/app/components/stream/user-profile/user-profile.component.ts
index cd5a35b2..e4fe07db 100644
--- a/src/app/components/stream/user-profile/user-profile.component.ts
+++ b/src/app/components/stream/user-profile/user-profile.component.ts
@@ -157,7 +157,7 @@ export class UserProfileComponent implements OnInit {
                 this.isLoading = false;
                 this.statusLoading = true;
 
-                this.displayedAccount = account;
+                this.displayedAccount = this.fixPleromaFieldsUrl(account);
                 this.hasNote = account && account.note && account.note !== '<p></p>';
                 if (this.hasNote) {
                     this.note = this.emojiConverter.applyEmojis(account.emojis, account.note, EmojiTypeEnum.medium);
@@ -178,6 +178,18 @@ export class UserProfileComponent implements OnInit {
             });
     }
 
+    private fixPleromaFieldsUrl(acc: Account): Account {
+        if(acc.fields){
+            acc.fields.forEach(f => {
+                if(f.value.includes('<a href="') && !f.value.includes('target="_blank"')){
+                    f.value = f.value.replace('<a href="', '<a target="_blank" href="');
+                }
+            });
+        }
+
+        return acc;
+    }
+
     private getPinnedStatuses(userAccount: AccountInfo, account: Account): Promise<void> {
         return this.mastodonService.getAccountStatuses(userAccount, account.id, false, true, false, null, null, 20)
             .then((statuses: Status[]) => {

From 8df8eb7de8863729a474e29025601119b43d0557 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Tue, 25 Feb 2020 20:08:37 -0500
Subject: [PATCH 4/4] road to 0.20.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 503929aa..ad92c569 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sengi",
-    "version": "0.20.0",
+    "version": "0.20.1",
     "license": "AGPL-3.0-or-later",
     "main": "main-electron.js",
     "description": "A multi-account desktop client for Mastodon and Pleroma",