From 474d559e3473870ddcbe5f7c1d3e390571acd917 Mon Sep 17 00:00:00 2001
From: nikurasu <publicmail@nikurasu.gay>
Date: Fri, 3 Feb 2023 13:35:34 +0100
Subject: [PATCH 1/5] Added tick to choosen poll options

---
 src/routes/_components/status/StatusPoll.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/routes/_components/status/StatusPoll.html b/src/routes/_components/status/StatusPoll.html
index a9116ba9d..6824136e9 100644
--- a/src/routes/_components/status/StatusPoll.html
+++ b/src/routes/_components/status/StatusPoll.html
@@ -1,10 +1,13 @@
 <div class={computedClass} aria-busy={loading} >
   {#if voted || expired }
     <ul class="poll-choices" aria-label="{intl.pollResults}">
-      {#each options as option}
+      {#each options as option, i}
         <li class="poll-choice option">
           <div class="option-text">
-            <strong>{option.share}%</strong> <span>{@html cleanTitle(option.title)}</span>
+            <strong>{option.share}%</strong><span>{@html cleanTitle(option.title)}</span>
+            {#if own_votes == i || Object.values(own_votes).includes(i)}
+            <SvgIcon className="poll-icon" href="#fa-check" />
+             {/if}
           </div>
           <svg aria-hidden="true">
             <line x1="0" y1="0" x2="{option.share}%" y2="0" />
@@ -109,6 +112,8 @@
     word-wrap: break-word;
     white-space: pre-wrap;
     font-size: 1.1em;
+    display: flex;
+    gap: .5em;
   }
 
   svg {
@@ -303,6 +308,7 @@
       // Misskey reports the "voters_count" as null, so just use the "votes_count"
       votersOrVotesCount: ({ votersCount, votesCount }) => typeof votersCount === 'number' ? votersCount : votesCount,
       voted: ({ poll }) => poll.voted,
+      own_votes: ({ poll }) => poll.own_votes,
       multiple: ({ poll }) => poll.multiple,
       expired: ({ poll }) => poll.expired,
       expiresAt: ({ poll }) => poll.expires_at,

From c7d2dee162df28e04976018da1ebde82b1a5b9b1 Mon Sep 17 00:00:00 2001
From: Annika Backstrom <annika@sixohthree.com>
Date: Wed, 3 May 2023 18:57:24 +0100
Subject: [PATCH 2/5] Add "Join Date" to profile, fixes #54

---
 src/intl/en-US.js                              |  2 ++
 .../profile/AccountProfileDetails.html         | 18 +++++++++++++++++-
 src/routes/_utils/formatters.js                |  6 ++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/intl/en-US.js b/src/intl/en-US.js
index e952f4eea..dd4db1b08 100644
--- a/src/intl/en-US.js
+++ b/src/intl/en-US.js
@@ -296,9 +296,11 @@ export default {
   statuses: 'Toots',
   follows: 'Follows',
   followers: 'Followers',
+  joined: 'Joined',
   moreOptions: 'More options',
   followersLabel: 'Followed by {count}',
   followingLabel: 'Follows {count}',
+  joinedLabel: 'Joined on {date}',
   followLabel: `Follow {requested, select,
     true {(follow requested)}
     other {}
diff --git a/src/routes/_components/profile/AccountProfileDetails.html b/src/routes/_components/profile/AccountProfileDetails.html
index c275da013..60de834d6 100644
--- a/src/routes/_components/profile/AccountProfileDetails.html
+++ b/src/routes/_components/profile/AccountProfileDetails.html
@@ -1,5 +1,15 @@
 <h2 class="sr-only">{intl.statisticsAndMoreOptions}</h2>
 <div class="account-profile-details">
+  <span class="account-profile-details-item"
+    aria-label={joinedLabel}
+  >
+    <span class="account-profile-details-item-datum">
+      {joinDate}
+    </span>
+    <span class="account-profile-details-item-title">
+      {intl.joined}
+    </span>
+  </span>
   <div class="account-profile-details-item">
     <span class="account-profile-details-item-datum">
       {numStatusesDisplay}
@@ -93,6 +103,7 @@ <h2 class="sr-only">{intl.statisticsAndMoreOptions}</h2>
   import { LOCALE } from '../../_static/intl.js'
   import { formatIntl } from '../../_utils/formatIntl.js'
   import { thunk } from '../../_utils/thunk.js'
+  import { shortAbsoluteDateOnlyFormatter } from '../../_utils/formatters.js'
 
   const numberFormat = thunk(() => new Intl.NumberFormat(LOCALE))
 
@@ -114,7 +125,12 @@ <h2 class="sr-only">{intl.statisticsAndMoreOptions}</h2>
       ),
       followingLabel: ({ numFollowing }) => (
         formatIntl('intl.followingLabel', { count: numFollowing })
-      )
+      ),
+      joinedLabel: ({ joinDate }) => (
+        formatIntl('intl.joinedLabel', { date: joinDate })
+      ),
+      createdAtDateTS: ({ account }) => new Date(account.created_at).getTime(),
+      joinDate: ({ createdAtDateTS }) => shortAbsoluteDateOnlyFormatter().format(createdAtDateTS)
     }
   }
 </script>
diff --git a/src/routes/_utils/formatters.js b/src/routes/_utils/formatters.js
index c8f07cfa7..515c5357b 100644
--- a/src/routes/_utils/formatters.js
+++ b/src/routes/_utils/formatters.js
@@ -42,3 +42,9 @@ export const dayOnlyAbsoluteDateFormatter = thunk(() => safeFormatter(new Intl.D
   month: 'short',
   day: 'numeric'
 })))
+
+export const shortAbsoluteDateOnlyFormatter = thunk(() => safeFormatter(new Intl.DateTimeFormat(LOCALE, {
+  year: 'numeric',
+  month: 'short',
+  day: 'numeric',
+})))

From 3b4c8f95bd70c576b0a10f557b9285ff42910079 Mon Sep 17 00:00:00 2001
From: Matty Jorgensen <me@prplecake.com>
Date: Fri, 22 Dec 2023 21:15:20 -0600
Subject: [PATCH 3/5] Add live branch to CI workflows

---
 .github/workflows/e2e-tests-readonly.yml  | 2 +-
 .github/workflows/e2e-tests-readwrite.yml | 2 +-
 .github/workflows/unit-tests.yml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-tests-readonly.yml b/.github/workflows/e2e-tests-readonly.yml
index 539682ac6..776e8578e 100644
--- a/.github/workflows/e2e-tests-readonly.yml
+++ b/.github/workflows/e2e-tests-readonly.yml
@@ -1,7 +1,7 @@
 name: Read-only e2e tests
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main, live ]
 jobs:
   test:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/e2e-tests-readwrite.yml b/.github/workflows/e2e-tests-readwrite.yml
index f0bd6fffa..de12343da 100644
--- a/.github/workflows/e2e-tests-readwrite.yml
+++ b/.github/workflows/e2e-tests-readwrite.yml
@@ -1,7 +1,7 @@
 name: Read-write e2e tests
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main, live ]
 jobs:
   test:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 52f1b977a..0ae7a8338 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -1,7 +1,7 @@
 name: Unit tests
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main, live ]
 jobs:
   test:
     runs-on: ubuntu-latest

From 4ecfa020b091a2a3a6dbe3c696754d538b799b4e Mon Sep 17 00:00:00 2001
From: Matty Jorgensen <me@prplecake.com>
Date: Fri, 22 Dec 2023 21:15:27 -0600
Subject: [PATCH 4/5] Add .nvmrc

---
 .nvmrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .nvmrc

diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..658984787
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v18.0.0

From c56ae9f5d5ed7dcce6b5bc43c911385d8b1472d7 Mon Sep 17 00:00:00 2001
From: Matty Jorgensen <me@prplecake.com>
Date: Fri, 22 Dec 2023 21:54:12 -0600
Subject: [PATCH 5/5] Fix lint issue

---
 src/routes/_utils/formatters.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/_utils/formatters.js b/src/routes/_utils/formatters.js
index 515c5357b..08bef0915 100644
--- a/src/routes/_utils/formatters.js
+++ b/src/routes/_utils/formatters.js
@@ -46,5 +46,5 @@ export const dayOnlyAbsoluteDateFormatter = thunk(() => safeFormatter(new Intl.D
 export const shortAbsoluteDateOnlyFormatter = thunk(() => safeFormatter(new Intl.DateTimeFormat(LOCALE, {
   year: 'numeric',
   month: 'short',
-  day: 'numeric',
+  day: 'numeric'
 })))