qol

landenpls · Aug 27, 2021 · 10c63b6 · 10c63b6
1 parent a8c3056
commit 10c63b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.vs/last.rpc/v16/.suo b/.vs/last.rpc/v16/.suo
diff --git a/ConfigManager.cs b/ConfigManager.cs
@@ -10,6 +10,7 @@ public class ConfigManager
     private static string GetDefaultConfig()
     {
         Dictionary<string, string> DefaultConfigRaw = new Dictionary<string, string> { };
+        DefaultConfigRaw.Add("poll_time", "5000");
         DefaultConfigRaw.Add("lastfm_user", "YOUR LAST.FM USERNAME");
         DefaultConfigRaw.Add("api_key", "GET AN API KEY AT https://www.last.fm/api/account/create");
         return JsonConvert.SerializeObject(DefaultConfigRaw);

diff --git a/Program.cs b/Program.cs
@@ -25,6 +25,7 @@ static void Main(string[] args)
         Dictionary<string, string>? config = ConfigManager.GetConfig();
         string api_key = config["api_key"];
         string lastfm_user = config["lastfm_user"];
+        long poll_time = (config["poll_time"] != null ? Int64.Parse(config["poll_time"]) : (long)5) * 1000;
 
         Logger.LogLast("Fetching user \"" + lastfm_user + "\" on last.fm");
         lastapi lastfmapi = new lastapi(api_key);
@@ -57,8 +58,8 @@ static void Main(string[] args)
                             bool isFavorite = false;
                             if (extraData.Count > 0)
                             {
-                                endOffset += extraData["duration"];
-                                isFavorite = extraData["isFavorite"];
+                                endOffset += extraData["duration"] || 0;
+                                isFavorite = extraData["isFavorite"] || false;
                             };
                             var albumFormatted = "";
                             if (nowplaying["album"] != "" && nowplaying["album"] != nowplaying["name"])
@@ -70,10 +71,6 @@ static void Main(string[] args)
                                 Type = Discord.ActivityType.Listening,
                                 Details = nowplaying["name"],
                                 State = nowplaying["artist"] + albumFormatted,
-                                Timestamps =
-                                {
-                                    End = DateTimeOffset.Now.ToUnixTimeMilliseconds() + endOffset,
-                                },
                                 Assets =
                                 {
                                     LargeImage = "lastfm",
@@ -86,6 +83,10 @@ static void Main(string[] args)
                                 activity.Assets.SmallImage = "loved";
                                 activity.Assets.SmallText = "Loved Track";
                             };
+                            if (endOffset > 0)
+                            {
+                                activity.Timestamps.End = DateTimeOffset.Now.ToUnixTimeMilliseconds() + endOffset;
+                            }
                             activityManager.UpdateActivity(activity, callback);
                         }
                     }