From 2c9930bd5b5c1279e0890aeba673ad6b5ce2af18 Mon Sep 17 00:00:00 2001
From: NEETzsche <neetzsche@tutanota.com>
Date: Thu, 9 Nov 2023 15:03:21 -0700
Subject: Display the latest scrobble under a user's name

---
 src/components/status/status.js  | 12 ++++++++++--
 src/components/status/status.vue | 20 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'src/components/status')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index e722a635..a339694d 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -39,7 +39,8 @@ import {
   faThumbtack,
   faChevronUp,
   faChevronDown,
-  faAngleDoubleRight
+  faAngleDoubleRight,
+  faPlay
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -59,7 +60,8 @@ library.add(
   faThumbtack,
   faChevronUp,
   faChevronDown,
-  faAngleDoubleRight
+  faAngleDoubleRight,
+  faPlay
 )
 
 const camelCase = name => name.charAt(0).toUpperCase() + name.slice(1)
@@ -415,6 +417,12 @@ const Status = {
     },
     shouldDisplayQuote () {
       return this.quotedStatus && this.displayQuote
+    },
+    scrobblePresent () {
+      return !this.mergedConfig.hideScrobbles && this.status.user.latestScrobble && this.status.user.latestScrobble.artist
+    },
+    scrobble () {
+      return this.status.user.latestScrobble
     }
   },
   methods: {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index c49a9e7b..ad625643 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -249,6 +249,25 @@
                 </button>
               </span>
             </div>
+            <div class="status-rich-presence" v-if="scrobblePresent">
+              <FAIcon
+                class="fa-scale-110 fa-old-padding"
+                icon="music"
+              />
+              {{ scrobble.artist }} — {{ scrobble.title }}
+              <FAIcon
+                class="fa-scale-110 fa-old-padding"
+                icon="play"
+              />
+              <span class="status-rich-presence-time">
+                <Timeago
+                  template-key="time.in_past"
+                  :time="scrobble.created_at"
+                  :auto-update="60"
+                />
+              </span>
+              </div>
+            </div>
             <div
               v-if="isReply || hasMentionsLine"
               class="heading-reply-row"
@@ -345,7 +364,6 @@
                 </template>
               </i18n-t>
             </div>
-          </div>
 
           <StatusContent
             ref="content"
-- 
cgit v1.2.3-70-g09d2


From 55d4ea3643a3bdb9e350c559d2d9a5f8608a7910 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 10 Nov 2023 15:24:13 +0200
Subject: fix layout

---
 src/components/status/status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/status')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ad625643..d66de562 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -266,7 +266,6 @@
                   :auto-update="60"
                 />
               </span>
-              </div>
             </div>
             <div
               v-if="isReply || hasMentionsLine"
@@ -364,6 +363,7 @@
                 </template>
               </i18n-t>
             </div>
+          </div>
 
           <StatusContent
             ref="content"
-- 
cgit v1.2.3-70-g09d2