Fix for missing users and fix for duplicate key error in scrape purch…

…ased tab
sim0n00ps · Oct 31, 2024 · 821d48b · 821d48b
1 parent 257325b
commit 821d48b
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/OF DL/Helpers/APIHelper.cs b/OF DL/Helpers/APIHelper.cs
@@ -290,7 +290,7 @@ public async Task<JObject> GetUserInfoById(string endpoint)
                     Subscriptions newSubscriptions = new();
                     string? loopbody = await BuildHeaderAndExecuteRequests(getParams, endpoint, new HttpClient());
 
-                    if (!string.IsNullOrEmpty(loopbody) && !loopbody.Contains("[]"))
+                    if (!string.IsNullOrEmpty(loopbody) && (!loopbody.Contains("[]") || loopbody.Trim() != "[]"))
                     {
                         newSubscriptions = JsonConvert.DeserializeObject<Subscriptions>(loopbody, m_JsonSerializerSettings);
                     }
@@ -2045,7 +2045,10 @@ public async Task<Dictionary<string, int>> GetPurchasedTabUsers(string endpoint,
                             {
                                 if (!config.BypassContentForCreatorsWhoNoLongerExist)
                                 {
-                                    purchasedTabUsers.Add($"Deleted User - {purchase.fromUser.id}", purchase.fromUser.id);
+                                    if(!purchasedTabUsers.ContainsKey($"Deleted User - {purchase.fromUser.id}"))
+                                    {
+                                        purchasedTabUsers.Add($"Deleted User - {purchase.fromUser.id}", purchase.fromUser.id);
+                                    }
                                 }
                                 Log.Debug("Content creator not longer exists - {0}", purchase.fromUser.id);
                             }
@@ -2092,9 +2095,12 @@ public async Task<Dictionary<string, int>> GetPurchasedTabUsers(string endpoint,
                             {
                                 if (!config.BypassContentForCreatorsWhoNoLongerExist)
                                 {
-                                    purchasedTabUsers.Add($"Deleted User - {purchase.fromUser.id}", purchase.fromUser.id);
+                                    if(!purchasedTabUsers.ContainsKey($"Deleted User - {purchase.author.id}"))
+                                    {
+                                        purchasedTabUsers.Add($"Deleted User - {purchase.author.id}", purchase.author.id);
+                                    }
                                 }
-                                Log.Debug("Content creator not longer exists - {0}", purchase.fromUser.id);
+                                Log.Debug("Content creator not longer exists - {0}", purchase.author.id);
                             }
                             else if (!string.IsNullOrEmpty(user[purchase.author.id.ToString()]["username"].ToString()))
                             {