From 7c3742cc308eec3a5e2b7226acc86d9dd06e54fe Mon Sep 17 00:00:00 2001
From: codey <codey@code.ee>
Date: Tue, 8 Oct 2024 06:28:02 -0400
Subject: [PATCH] misc

---
 discord_presence.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/discord_presence.py b/discord_presence.py
index 4124e03..49e0baa 100644
--- a/discord_presence.py
+++ b/discord_presence.py
@@ -37,9 +37,11 @@ class DiscordPresence:
                     data = request.json().get('response')
                     track_artist = data.get('artist')
                     track_title = data.get('title')
+                    start_time = data.get('start')
+                    end_time = data.get('end')
                     track = f"{data.get('artist')} - {data.get('title')}"
                     if self.last_track == track or self.last_updated and (now - self.last_updated < 10):
-                        print(f"Skip: {self.last_track} & {(now - self.last_updated)}")
+                        # print(f"Skip: {self.last_track} & {(now - self.last_updated)}")
                         time.sleep(5)
                         continue
                     self.last_updated = now
@@ -52,9 +54,8 @@ class DiscordPresence:
                                                         }, json={
                                                             'short': True,
                                                         }, timeout=(1, 2))
-                        print(f"Rand msg text: {rand_msg_request.text}")
                         rand_msg = rand_msg_request.json().get('msg').strip()
-                        rand_msg = re.sub(r'(<b>|</b>)', '', re.sub(r'(<br>|<br/>|<br />)', ' ', rand_msg))
+                        rand_msg = re.sub(r'(<b>|</b>)', '', re.sub(r'(<br>|<br/>|<br />|\n|\r\n)', ' ', rand_msg))
                         if len(rand_msg) > 126:
                             rand_msg = None
                     except:
@@ -63,23 +64,28 @@ class DiscordPresence:
 
                     print(RPC.update(
                         details=track_title,
-                        state=f"by {track_artist}",
-                        large_image=f"{self.album_art_url}?{now}",
-                        large_text=f"~ {rand_msg}" if rand_msg else None,
+                        state=track_artist,
+                        large_image=f"{self.album_art_url}?t={now}",
+                        large_text=f"{rand_msg}" if rand_msg else None,
+                        start=start_time,
+                        end=end_time,
                         activity_type=ActivityType.LISTENING,
                         buttons=[
                             {
-                            "label": "Site",
-                            "url": "https://codey.lol" 
+                            "label": "Listen",
+                            "url": "https://codey.lol/radio" 
                         },]
                     ))
-                    print(f"Track: {track}")
                 except:
                     print(traceback.format_exc())
                     time.sleep(5)
                     continue
         except:
             print(traceback.format_exc())
+            try:
+                self.loop()
+            except:
+                pass