From cda9566eb0789c7246772b05fcde9f4943b46634 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 28 Jan 2018 17:10:03 -0800
Subject: [PATCH] fix links in statuses

---
 routes/_components/AccountProfile.html        | 12 ++++++-
 routes/_components/status/Status.html         | 33 ++++++++++++++-----
 .../_components/timeline/StatusListItem.html  |  7 +++-
 routes/_components/timeline/Timeline.html     |  6 +++-
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/routes/_components/AccountProfile.html b/routes/_components/AccountProfile.html
index b5ef408c..54054352 100644
--- a/routes/_components/AccountProfile.html
+++ b/routes/_components/AccountProfile.html
@@ -6,7 +6,9 @@
         <img src="{{profile.avatar}}" aria-hidden="true">
       </div>
       <div class="account-profile-name">
-        {{profile.display_name}}
+        <a rel="noopener" target="_blank" href="{{profile.url}}">
+          {{profile.display_name}}
+        </a>
       </div>
       <div class="account-profile-username">
         {{'@' + profile.acct}}
@@ -127,6 +129,14 @@
     text-overflow: ellipsis;
     min-width: 0;
   }
+  .account-profile-name a {
+    color: var(--body-text-color);
+    text-decoration: none;
+  }
+  .account-profile-name a:hover {
+    color: var(--body-text-color);
+    text-decoration: underline;
+  }
   .account-profile-note {
     grid-area: note;
     padding: 10px 0;
diff --git a/routes/_components/status/Status.html b/routes/_components/status/Status.html
index 4847e5ed..2c9a2a3f 100644
--- a/routes/_components/status/Status.html
+++ b/routes/_components/status/Status.html
@@ -7,22 +7,37 @@
         <use xlink:href="#fa-retweet" />
       </svg>
       <span>
-        <a href="/accounts/{{status.account.id}}">
-          {{status.account.username}}
-        </a> boosted
+        {{#if timelineType === 'account' && timelineValue === status.account.id}}
+          <a rel="noopener" target="_blank"  href="{{status.account.url}}">{{status.account.username}}</a>
+        {{else}}
+          <a href="/accounts/{{status.account.id}}">{{status.account.username}}</a>
+        {{/if}}
+        boosted
       </span>
     </div>
   {{/if}}
   <div class="status-author">
-    <a class="status-author-name" href="/accounts/{{originalAccount.id}}">
-      {{originalAccount.display_name || originalAccount.username}}
-    </a>
+    {{#if timelineType === 'account' && timelineValue === originalAccount.id}}
+      <a class="status-author-name" rel="noopener" target="_blank" href="{{originalAccount.url}}">
+        {{originalAccount.display_name || originalAccount.username}}
+      </a>
+    {{else}}
+      <a class="status-author-name" href="/accounts/{{originalAccount.id}}">
+        {{originalAccount.display_name || originalAccount.username}}
+      </a>
+    {{/if}}
     <span class="status-author-handle">
       {{'@' + originalAccount.acct}}
     </span>
-    <a class="status-author-date" href="/statuses/{{originalStatus.id}}">
-      <time datetime={{createdAtDate}} title="{{relativeDate}}">{{relativeDate}}</time>
-    </a>
+    {{#if timelineType === 'status'}}
+      <a class="status-author-date" rel="noopener" target="_blank" href="{{originalStatus.url}}">
+        <time datetime={{createdAtDate}} title="{{relativeDate}}">{{relativeDate}}</time>
+      </a>
+    {{else}}
+      <a class="status-author-date" href="/statuses/{{originalStatus.id}}">
+        <time datetime={{createdAtDate}} title="{{relativeDate}}">{{relativeDate}}</time>
+      </a>
+    {{/if}}
   </div>
   <Avatar account={{originalAccount}} className="status-sidebar"/>
   {{#if originalStatus.spoiler_text}}
diff --git a/routes/_components/timeline/StatusListItem.html b/routes/_components/timeline/StatusListItem.html
index ad369acb..6b9635ec 100644
--- a/routes/_components/timeline/StatusListItem.html
+++ b/routes/_components/timeline/StatusListItem.html
@@ -1,4 +1,9 @@
-<Status status="{{virtualProps}}" index="{{virtualIndex}}" length="{{virtualLength}}" on:recalculateHeight />
+<Status status="{{virtualProps.status}}"
+        timelineType="{{virtualProps.timelineType}}"
+        timelineValue="{{virtualProps.timelineValue}}"
+        index="{{virtualIndex}}"
+        length="{{virtualLength}}"
+        on:recalculateHeight />
 <script>
   import Status from '../status/Status.html'
 
diff --git a/routes/_components/timeline/Timeline.html b/routes/_components/timeline/Timeline.html
index 61c30bd3..fd29a82e 100644
--- a/routes/_components/timeline/Timeline.html
+++ b/routes/_components/timeline/Timeline.html
@@ -33,7 +33,11 @@
       LoadingFooter: LoadingFooter
     }),
     computed: {
-      makeProps: ($currentInstance) => (statusId) => database.getStatus($currentInstance, statusId),
+      makeProps: ($currentInstance, timelineType, timelineValue) => async (statusId) => ({
+        timelineType: timelineType,
+        timelineValue: timelineValue,
+        status: await database.getStatus($currentInstance, statusId)
+      }),
       label: (timeline, $currentInstance, timelineType, timelineValue) => {
         if (timelines[timeline]) {
           return `${timelines[timeline].label} timeline for ${$currentInstance}`