v1.3.7

ItsBrank · ItsBrank · commit 7901c1b36fd5 · 2024-05-12T16:15:31.000-04:00
- Added the news tab back in the launcher, with a fallback incase Psyonix keeps blocking the launcher from downloading news.
- Fixed the update or installer popup getting stuck open if an error occurred while downloading, now if an error happens it will ask you if you want to try again.
- Fixed a crash that could happen when spamming the previous and next buttons in the news back too fast.
diff --git a/Architecture/Result.cs b/Architecture/Result.cs
@@ -6,23 +6,23 @@ namespace CodeRedLauncher
     public class Result
     {
         public bool Succeeded { get; set; }
-        public string FailReason { get; set; }
+        public string? FailReason { get; set; }
 
         public Result()
         {
             Succeeded = false;
             FailReason = null;
         }
 
-        public Result(bool bSucceeded, string failReason = "")
+        public Result(bool bSucceeded, string? failReason = null)
         {
             Succeeded = bSucceeded;
             FailReason = failReason;
         }
-        
-        bool HasFailReason()
+
+        public bool HasFailReason()
         {
-            return (FailReason != null);
+            return !string.IsNullOrEmpty(FailReason);
         }
     }
 }
diff --git a/Controls/CRNews.cs b/Controls/CRNews.cs
@@ -11,6 +11,9 @@ namespace CodeRedLauncher.Controls
 {
     public partial class CRNews : UserControl
     {
+        private string m_altUrl = "https://raw.githubusercontent.com/CodeRedModding/CodeRed-Retrievers/main/Public/News.cr"; // Psyonix started blocking requests to their site...have to use my own now.
+        private string m_altThumbnail = "https://i.imgur.com/g9ssgL7.png";
+
         private IconStore m_calendarIcons = new IconStore();
         private IconStore m_authorIcons = new IconStore();
         private IconStore m_categoryIcons = new IconStore();
@@ -33,13 +36,16 @@ private class NewsStorage
 
             public NewsStorage(string bodyContent)
             {
+                Timestamp = "Rocket League";
+                Author = "Psyonix Team";
                 ParseJson(bodyContent);
             }
 
             public void ParseJson(string bodyContent)
             {
                 if (bodyContent.Contains("slug"))
                 {
+                    bodyContent = bodyContent.Replace("\": \"", "\":\"");
                     Match titleMatch = Regex.Match(bodyContent, "(?<=\"title\":\")(.*?)(?=\")");
                     Match urlMatch = Regex.Match(bodyContent, "(?<=\"slug\":\")(.*?)(?=\")");
                     Match imageMatch = Regex.Match(bodyContent, "(?<=\"imageUrl\":\")(.*?)(?=\")");
@@ -415,6 +421,7 @@ private async Task<NewsStorage> ParseLink(NewsStorage newsStorage)
                             newsStorage.ThumbnailUrl = thumbnailMatch.Groups[1].Value;
                             Int32 jpg = newsStorage.ThumbnailUrl.IndexOf(".jpg");
                             Int32 png = newsStorage.ThumbnailUrl.IndexOf(".png");
+                            Int32 webp = newsStorage.ThumbnailUrl.IndexOf(".webp");
 
                             if (jpg > 0)
                             {
@@ -424,6 +431,10 @@ private async Task<NewsStorage> ParseLink(NewsStorage newsStorage)
                             {
                                 newsStorage.ThumbnailUrl = (newsStorage.ThumbnailUrl.Substring(0, png) + ".png");
                             }
+                            else if (webp > 0)
+                            {
+                                newsStorage.ThumbnailUrl = (newsStorage.ThumbnailUrl.Substring(0, webp) + ".webp");
+                            }
                         }
 
                         Match thumbnailMatchAlt = Regex.Match(pageBody, "<p dir=\"ltr\"><img src=\"(.*)\" data-id=\"");
@@ -454,44 +465,63 @@ private async Task<NewsStorage> ParseLink(NewsStorage newsStorage)
             return newsStorage;
         }
 
-        public async void ParseArticles(string url)
+        public async void ParseArticles(string url, bool bRecursive = false)
         {
             if (!string.IsNullOrEmpty(url))
             {
-                return; // Fuck Psyonix for blocking requests to their news url, billion dollar company can't give us an actual api to use.
-
+                bool fallback = false;
                 string pageBody = await Downloaders.DownloadPage(url);
 
-                if (!string.IsNullOrEmpty(pageBody))
+                if (!string.IsNullOrEmpty(pageBody)) 
                 {
                     m_articles.Clear();
                     ResetArticles();
-                    MatchCollection articleLinks = Regex.Matches(pageBody.Replace("\\", ""), "(?=\"title\")(.*?)(?=})");
+
+                    MatchCollection articleLinks = Regex.Matches(pageBody.Replace("\\", ""), (bRecursive ? "(?s)(?=\"title).*?(?=})" : "(?=\"title\")(.*?)(?=})"));
 
                     Int32 articles = 0;
 
                     for (Int32 i = 0; i < articleLinks.Count; i++)
                     {
                         Match link = articleLinks[i];
 
-                        if (link.Success && link.Groups[1].Success && link.Groups[1].Value.Contains("slug"))
+                        if (link.Success && link.Groups[0].Success && link.Groups[0].ToString().Contains("slug"))
                         {
                             articles++;
-                            m_articles.Add(new NewsStorage(link.Groups[1].Value));
+                            m_articles.Add(new NewsStorage(link.Groups[0].ToString()));
                         }
 
-                        if (articles >= m_maxIndexes)
+                        if (articles == m_maxIndexes)
                         {
                             break;
                         }
                     }
 
-                    LoadAllIndexes(); // Parse and download everything in the background.
-                    LoadPreviousArticle();
+                    if (articles > 0)
+                    {
+                        Logger.Write("Found news article links!");
+                        LoadAllIndexes(); // Parse and download everything in the background.
+                        LoadPreviousArticle();
+                        return;
+                    }
+                    else
+                    {
+                        fallback = true;
+                    }
                 }
                 else
                 {
-                    Logger.Write("Failed to download news article info!", LogLevel.LEVEL_WARN);
+                    fallback = true;
+                }
+
+                if (fallback && !bRecursive)
+                {
+                    Logger.Write("Couldn't find official news links, resorting to fallback url!");
+                    ParseArticles(m_altUrl, true);
+                }
+                else if (bRecursive)
+                {
+                    Logger.Write("Fallback url failed, no news links found!");
                 }
             }
         }
@@ -524,7 +554,7 @@ public async void LoadAllIndexes()
                         if (newsStorage.ThumbnailImage == null)
                         {
                             newsStorage.ThumbnailUrl = "";
-                            newsStorage.ThumbnailUrlAlt = "https://i.imgur.com/dmpY0zQ.png";
+                            newsStorage.ThumbnailUrlAlt = m_altThumbnail;
                             newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrlAlt);
                         }
                     }
@@ -570,7 +600,7 @@ private async void LoadIndex()
                             if (newsStorage.ThumbnailImage == null)
                             {
                                 newsStorage.ThumbnailUrl = "";
-                                newsStorage.ThumbnailUrlAlt = "https://i.imgur.com/dmpY0zQ.png";
+                                newsStorage.ThumbnailUrlAlt = m_altThumbnail;
                                 newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrlAlt);
                             }
 
@@ -611,22 +641,34 @@ private async void LoadIndex()
 
         private void PreviousBtn_Click(object sender, EventArgs e)
         {
-            LoadPreviousArticle();
+            if (PreviousBtn.BackgroundImage != null)
+            {
+                LoadPreviousArticle();
+            }
         }
 
         private void PreviousBtn_DoubleClick(object sender, EventArgs e)
         {
-            LoadPreviousArticle();
+            if (PreviousBtn.BackgroundImage != null)
+            {
+                LoadPreviousArticle();
+            }
         }
 
         private void NextBtn_Click(object sender, EventArgs e)
         {
-            LoadNextArticle();
+            if (NextBtn.BackgroundImage != null)
+            {
+                LoadNextArticle();
+            }
         }
 
         private void NextBtn_DoubleClick(object sender, EventArgs e)
         {
-            LoadNextArticle();
+            if (NextBtn.BackgroundImage != null)
+            {
+                LoadNextArticle();
+            }
         }
 
         private void ThumbnailImg_Click(object sender, EventArgs e)
diff --git a/Controls/CRUpdate.cs b/Controls/CRUpdate.cs
@@ -20,7 +20,8 @@ public enum UpdateLayouts : byte
             Downloading,
             Module,
             Launcher,
-            Both
+            Both,
+            Fail
         }
 
         private UpdateLayouts m_updateType = UpdateLayouts.Module;
@@ -213,6 +214,14 @@ public void UpdateTheme()
                 DenyBtn.Visible = true;
                 GameBtn.Visible = false;
             }
+            else if (UpdateType == UpdateLayouts.Fail)
+            {
+                DescriptionLbl.Text = "An error occurred while downloading the latest version, would you like to try again?";
+                m_buttonsEnabled = true;
+                AcceptBtn.Visible = true;
+                DenyBtn.Visible = true;
+                GameBtn.Visible = false;
+            }
 
             if (ControlType == ControlTheme.Dark)
             {
diff --git a/Forms/MainFrm.Designer.cs b/Forms/MainFrm.Designer.cs
diff --git a/Forms/MainFrm.cs b/Forms/MainFrm.cs
@@ -1312,16 +1312,16 @@ private async void UpdatePopup_ButtonClickAccept(object sender, EventArgs e)
 
             if (report.Succeeded)
             {
+                NewsCtrl.ParseArticles(await Retrievers.GetNewsUrl());
                 UpdatePopup.HidePopup();
                 ProcessTmr.Start();
                 CheckForUpdates(true, false);
             }
-            else if (report.FailReason != null)
+            else if (report.HasFailReason())
             {
+                UpdatePopup.UpdateType = CRUpdate.UpdateLayouts.Fail;
                 Logger.Write(report.FailReason, LogLevel.LEVEL_ERROR);
             }
-
-            NewsCtrl.ParseArticles(await Retrievers.GetNewsUrl());
         }
 
         private async void UpdatePopup_ButtonClickDeny(object sender, EventArgs e)
diff --git a/Framework/Assembly.cs b/Framework/Assembly.cs
@@ -8,7 +8,7 @@ public static class Assembly
         private static readonly string m_description = "Manages and injects the CodeRed module for Rocket League. ";
         private static readonly string m_product = "CodeRedLauncher";
         private static readonly string m_copyright = "CodeRedModding 2024";
-        private static readonly string m_version = "1.3.6";
+        private static readonly string m_version = "1.3.7";
         private static readonly bool m_termsOfUse = false;
         private static readonly bool m_privatePolicy = false;
 
diff --git a/Framework/Retrievers.cs b/Framework/Retrievers.cs
@@ -44,7 +44,7 @@ public static async Task<bool> WebsiteOnline(string url)
             return false;
         }
 
-        public static async Task<Image> DownloadImage(string url)
+        public static async Task<Image> DownloadImage(string url, bool bNoCache = true)
         {
             Image image = null;
 
@@ -55,9 +55,13 @@ public static async Task<Image> DownloadImage(string url)
                     try
                     {
                         client.Timeout = m_timeout;
-                        client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue { NoCache = true, NoStore = true };
                         client.DefaultRequestHeaders.UserAgent.ParseAdd(m_userAgent);
 
+                        if (bNoCache)
+                        {
+                            client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue { NoCache = true, NoStore = true };
+                        }
+
                         HttpResponseMessage response = await client.GetAsync(url);
 
                         if (response.IsSuccessStatusCode)
@@ -89,7 +93,7 @@ public static async Task<Image> DownloadImage(string url)
             return image;
         }
 
-        public static async Task<string> DownloadPage(string url)
+        public static async Task<string> DownloadPage(string url, bool bNoCache = true)
         {
             string pageContent = "";
 
@@ -100,9 +104,13 @@ public static async Task<string> DownloadPage(string url)
                     using (HttpClient client = new HttpClient())
                     {
                         client.Timeout = m_timeout;
-                        client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue { NoCache = true, NoStore = true };
                         client.DefaultRequestHeaders.UserAgent.ParseAdd(m_userAgent);
 
+                        if (bNoCache)
+                        {
+                            client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue { NoCache = true, NoStore = true };
+                        }
+
                         HttpResponseMessage response = await client.GetAsync(url);
 
                         if (response.IsSuccessStatusCode)
@@ -124,7 +132,7 @@ public static async Task<string> DownloadPage(string url)
             return pageContent;
         }
 
-        public static async Task<bool> DownloadFile(string url, Architecture.Path folder, string fileName)
+        public static async Task<bool> DownloadFile(string url, Architecture.Path folder, string fileName, bool bNoCache = true)
         {
             if (folder.Exists() && !string.IsNullOrEmpty(url))
             {
@@ -135,6 +143,11 @@ public static async Task<bool> DownloadFile(string url, Architecture.Path folder
                         client.Timeout = m_timeout;
                         client.DefaultRequestHeaders.UserAgent.ParseAdd(m_userAgent);
 
+                        if (bNoCache)
+                        {
+                            client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue { NoCache = true, NoStore = true };
+                        }
+
                         HttpResponseMessage response = await client.GetAsync(url);
 
                         if (response.IsSuccessStatusCode)
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-04-12T17:00:36.7074137Z;True|2024-04-03T06:47:45.9088839-04:00;True|2024-02-27T19:00:12.7481260-05:00;True|2024-02-05T12:33:56.3871704-05:00;True|2024-02-05T12:33:40.9055040-05:00;True|2024-02-05T12:14:05.2718245-05:00;True|2024-01-11T22:34:10.0545942-05:00;True|2023-12-14T11:42:08.7749851-05:00;True|2023-12-11T04:37:59.0581676-05:00;True|2023-12-07T20:21:05.0260676-05:00;True|2023-12-07T20:15:40.7222580-05:00;True|2023-12-06T22:55:16.4882440-05:00;True|2023-12-06T22:53:36.1925636-05:00;True|2023-11-17T06:42:46.9521154-05:00;True|2023-11-17T06:36:00.5885901-05:00;True|2023-11-16T22:32:34.0407922-05:00;True|2023-10-25T18:05:44.6144276-04:00;True|2023-10-19T21:35:47.3332415-04:00;True|2023-09-29T15:21:56.0574702-04:00;True|2023-09-16T19:07:06.5515071-04:00;True|2023-09-16T19:06:08.9803131-04:00;True|2023-09-13T19:11:25.4534084-04:00;True|2023-09-12T15:15:53.5080335-04:00;True|2023-09-12T11:21:47.2201303-04:00;True|2023-09-11T17:53:54.1085377-04:00;True|2023-07-03T19:19:37.2984651-04:00;True|2023-06-23T12:19:10.5480937-04:00;True|2023-06-07T16:24:13.6686440-04:00;True|2023-06-07T16:19:33.2384233-04:00;True|2023-06-02T14:20:34.8667609-04:00;True|2023-06-02T14:19:16.9938932-04:00;True|2023-05-17T17:31:36.2391578-04:00;True|2023-05-13T13:56:01.0765277-04:00;True|2023-04-26T17:18:01.3003846-04:00;True|2023-04-17T18:09:22.0218857-04:00;True|2023-04-15T08:12:25.4751548-04:00;True|2023-02-23T17:42:55.3711325-05:00;True|2023-01-26T05:55:54.7338406-05:00;True|2023-01-14T16:37:43.9661254-05:00;True|2023-01-11T15:04:57.9184587-05:00;True|2023-01-01T06:51:43.9653309-05:00;True|2022-12-29T03:28:57.5161186-05:00;True|2022-12-25T20:55:07.0626032-05:00;True|2022-12-24T18:45:18.2492814-05:00;True|2022-12-24T17:58:05.8108440-05:00;True|2022-12-23T00:36:55.2356565-05:00;True|2022-12-22T20:46:31.3667454-05:00;True|2022-12-22T20:36:59.8978942-05:00;True|2022-12-22T20:32:40.9627042-05:00;True|2022-12-22T20:27:45.7845417-05:00;True|2022-12-22T20:08:26.4442830-05:00;True|2022-12-22T20:07:06.2254198-05:00;True|2022-12-22T20:01:04.3986967-05:00;True|2022-12-22T19:57:34.6741553-05:00;True|2022-12-22T19:46:09.3566048-05:00;True|2022-12-22T19:45:03.2884935-05:00;True|2022-12-22T19:36:42.2434776-05:00;True|2022-12-22T19:31:21.4738973-05:00;True|2022-12-22T19:27:34.9406205-05:00;False|2022-12-22T19:27:27.7152676-05:00;True|2022-12-22T19:14:05.9421852-05:00;True|2022-12-22T18:02:42.2130135-05:00;</History>
+    <History>True|2024-05-12T20:12:06.7431879Z;True|2024-04-12T13:00:36.7074137-04:00;True|2024-04-03T06:47:45.9088839-04:00;True|2024-02-27T19:00:12.7481260-05:00;True|2024-02-05T12:33:56.3871704-05:00;True|2024-02-05T12:33:40.9055040-05:00;True|2024-02-05T12:14:05.2718245-05:00;True|2024-01-11T22:34:10.0545942-05:00;True|2023-12-14T11:42:08.7749851-05:00;True|2023-12-11T04:37:59.0581676-05:00;True|2023-12-07T20:21:05.0260676-05:00;True|2023-12-07T20:15:40.7222580-05:00;True|2023-12-06T22:55:16.4882440-05:00;True|2023-12-06T22:53:36.1925636-05:00;True|2023-11-17T06:42:46.9521154-05:00;True|2023-11-17T06:36:00.5885901-05:00;True|2023-11-16T22:32:34.0407922-05:00;True|2023-10-25T18:05:44.6144276-04:00;True|2023-10-19T21:35:47.3332415-04:00;True|2023-09-29T15:21:56.0574702-04:00;True|2023-09-16T19:07:06.5515071-04:00;True|2023-09-16T19:06:08.9803131-04:00;True|2023-09-13T19:11:25.4534084-04:00;True|2023-09-12T15:15:53.5080335-04:00;True|2023-09-12T11:21:47.2201303-04:00;True|2023-09-11T17:53:54.1085377-04:00;True|2023-07-03T19:19:37.2984651-04:00;True|2023-06-23T12:19:10.5480937-04:00;True|2023-06-07T16:24:13.6686440-04:00;True|2023-06-07T16:19:33.2384233-04:00;True|2023-06-02T14:20:34.8667609-04:00;True|2023-06-02T14:19:16.9938932-04:00;True|2023-05-17T17:31:36.2391578-04:00;True|2023-05-13T13:56:01.0765277-04:00;True|2023-04-26T17:18:01.3003846-04:00;True|2023-04-17T18:09:22.0218857-04:00;True|2023-04-15T08:12:25.4751548-04:00;True|2023-02-23T17:42:55.3711325-05:00;True|2023-01-26T05:55:54.7338406-05:00;True|2023-01-14T16:37:43.9661254-05:00;True|2023-01-11T15:04:57.9184587-05:00;True|2023-01-01T06:51:43.9653309-05:00;True|2022-12-29T03:28:57.5161186-05:00;True|2022-12-25T20:55:07.0626032-05:00;True|2022-12-24T18:45:18.2492814-05:00;True|2022-12-24T17:58:05.8108440-05:00;True|2022-12-23T00:36:55.2356565-05:00;True|2022-12-22T20:46:31.3667454-05:00;True|2022-12-22T20:36:59.8978942-05:00;True|2022-12-22T20:32:40.9627042-05:00;True|2022-12-22T20:27:45.7845417-05:00;True|2022-12-22T20:08:26.4442830-05:00;True|2022-12-22T20:07:06.2254198-05:00;True|2022-12-22T20:01:04.3986967-05:00;True|2022-12-22T19:57:34.6741553-05:00;True|2022-12-22T19:46:09.3566048-05:00;True|2022-12-22T19:45:03.2884935-05:00;True|2022-12-22T19:36:42.2434776-05:00;True|2022-12-22T19:31:21.4738973-05:00;True|2022-12-22T19:27:34.9406205-05:00;False|2022-12-22T19:27:27.7152676-05:00;True|2022-12-22T19:14:05.9421852-05:00;True|2022-12-22T18:02:42.2130135-05:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,23 @@ namespace CodeRedLauncher`
`6`	`6`	`public class Result`
`7`	`7`	`{`
`8`	`8`	`public bool Succeeded { get; set; }`
`9`		`- public string FailReason { get; set; }`
	`9`	`+ public string? FailReason { get; set; }`
`10`	`10`
`11`	`11`	`public Result()`
`12`	`12`	`{`
`13`	`13`	`Succeeded = false;`
`14`	`14`	`FailReason = null;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public Result(bool bSucceeded, string failReason = "")`
	`17`	`+ public Result(bool bSucceeded, string? failReason = null)`
`18`	`18`	`{`
`19`	`19`	`Succeeded = bSucceeded;`
`20`	`20`	`FailReason = failReason;`
`21`	`21`	`}`
`22`		`-`
`23`		`- bool HasFailReason()`
	`22`	`+`
	`23`	`+ public bool HasFailReason()`
`24`	`24`	`{`
`25`		`- return (FailReason != null);`
	`25`	`+ return !string.IsNullOrEmpty(FailReason);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ namespace CodeRedLauncher.Controls`
`11`	`11`	`{`
`12`	`12`	`public partial class CRNews : UserControl`
`13`	`13`	`{`
	`14`	`+ private string m_altUrl = "https://raw.githubusercontent.com/CodeRedModding/CodeRed-Retrievers/main/Public/News.cr"; // Psyonix started blocking requests to their site...have to use my own now.`
	`15`	`+ private string m_altThumbnail = "https://i.imgur.com/g9ssgL7.png";`
	`16`	`+`
`14`	`17`	`private IconStore m_calendarIcons = new IconStore();`
`15`	`18`	`private IconStore m_authorIcons = new IconStore();`
`16`	`19`	`private IconStore m_categoryIcons = new IconStore();`
`@@ -33,13 +36,16 @@ private class NewsStorage`
`33`	`36`
`34`	`37`	`public NewsStorage(string bodyContent)`
`35`	`38`	`{`
	`39`	`+ Timestamp = "Rocket League";`
	`40`	`+ Author = "Psyonix Team";`
`36`	`41`	`ParseJson(bodyContent);`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`public void ParseJson(string bodyContent)`
`40`	`45`	`{`
`41`	`46`	`if (bodyContent.Contains("slug"))`
`42`	`47`	`{`
	`48`	`+ bodyContent = bodyContent.Replace("\": \"", "\":\"");`
`43`	`49`	`Match titleMatch = Regex.Match(bodyContent, "(?<=\"title\":\")(.*?)(?=\")");`
`44`	`50`	`Match urlMatch = Regex.Match(bodyContent, "(?<=\"slug\":\")(.*?)(?=\")");`
`45`	`51`	`Match imageMatch = Regex.Match(bodyContent, "(?<=\"imageUrl\":\")(.*?)(?=\")");`
`@@ -415,6 +421,7 @@ private async Task<NewsStorage> ParseLink(NewsStorage newsStorage)`
`415`	`421`	`newsStorage.ThumbnailUrl = thumbnailMatch.Groups[1].Value;`
`416`	`422`	`Int32 jpg = newsStorage.ThumbnailUrl.IndexOf(".jpg");`
`417`	`423`	`Int32 png = newsStorage.ThumbnailUrl.IndexOf(".png");`
	`424`	`+ Int32 webp = newsStorage.ThumbnailUrl.IndexOf(".webp");`
`418`	`425`
`419`	`426`	`if (jpg > 0)`
`420`	`427`	`{`
`@@ -424,6 +431,10 @@ private async Task<NewsStorage> ParseLink(NewsStorage newsStorage)`
`424`	`431`	`{`
`425`	`432`	`newsStorage.ThumbnailUrl = (newsStorage.ThumbnailUrl.Substring(0, png) + ".png");`
`426`	`433`	`}`
	`434`	`+ else if (webp > 0)`
	`435`	`+ {`
	`436`	`+ newsStorage.ThumbnailUrl = (newsStorage.ThumbnailUrl.Substring(0, webp) + ".webp");`
	`437`	`+ }`
`427`	`438`	`}`
`428`	`439`
`429`	`440`	`Match thumbnailMatchAlt = Regex.Match(pageBody, "<p dir=\"ltr\"><img src=\"(.*)\" data-id=\"");`
`@@ -454,44 +465,63 @@ private async Task<NewsStorage> ParseLink(NewsStorage newsStorage)`
`454`	`465`	`return newsStorage;`
`455`	`466`	`}`
`456`	`467`
`457`		`- public async void ParseArticles(string url)`
	`468`	`+ public async void ParseArticles(string url, bool bRecursive = false)`
`458`	`469`	`{`
`459`	`470`	`if (!string.IsNullOrEmpty(url))`
`460`	`471`	`{`
`461`		`- return; // Fuck Psyonix for blocking requests to their news url, billion dollar company can't give us an actual api to use.`
`462`		`-`
	`472`	`+ bool fallback = false;`
`463`	`473`	`string pageBody = await Downloaders.DownloadPage(url);`
`464`	`474`
`465`		`- if (!string.IsNullOrEmpty(pageBody))`
	`475`	`+ if (!string.IsNullOrEmpty(pageBody))`
`466`	`476`	`{`
`467`	`477`	`m_articles.Clear();`
`468`	`478`	`ResetArticles();`
`469`		`- MatchCollection articleLinks = Regex.Matches(pageBody.Replace("\\", ""), "(?=\"title\")(.*?)(?=})");`
	`479`	`+`
	`480`	`+ MatchCollection articleLinks = Regex.Matches(pageBody.Replace("\\", ""), (bRecursive ? "(?s)(?=\"title).?(?=})" : "(?=\"title\")(.?)(?=})"));`
`470`	`481`
`471`	`482`	`Int32 articles = 0;`
`472`	`483`
`473`	`484`	`for (Int32 i = 0; i < articleLinks.Count; i++)`
`474`	`485`	`{`
`475`	`486`	`Match link = articleLinks[i];`
`476`	`487`
`477`		`- if (link.Success && link.Groups[1].Success && link.Groups[1].Value.Contains("slug"))`
	`488`	`+ if (link.Success && link.Groups[0].Success && link.Groups[0].ToString().Contains("slug"))`
`478`	`489`	`{`
`479`	`490`	`articles++;`
`480`		`- m_articles.Add(new NewsStorage(link.Groups[1].Value));`
	`491`	`+ m_articles.Add(new NewsStorage(link.Groups[0].ToString()));`
`481`	`492`	`}`
`482`	`493`
`483`		`- if (articles >= m_maxIndexes)`
	`494`	`+ if (articles == m_maxIndexes)`
`484`	`495`	`{`
`485`	`496`	`break;`
`486`	`497`	`}`
`487`	`498`	`}`
`488`	`499`
`489`		`- LoadAllIndexes(); // Parse and download everything in the background.`
`490`		`- LoadPreviousArticle();`
	`500`	`+ if (articles > 0)`
	`501`	`+ {`
	`502`	`+ Logger.Write("Found news article links!");`
	`503`	`+ LoadAllIndexes(); // Parse and download everything in the background.`
	`504`	`+ LoadPreviousArticle();`
	`505`	`+ return;`
	`506`	`+ }`
	`507`	`+ else`
	`508`	`+ {`
	`509`	`+ fallback = true;`
	`510`	`+ }`
`491`	`511`	`}`
`492`	`512`	`else`
`493`	`513`	`{`
`494`		`- Logger.Write("Failed to download news article info!", LogLevel.LEVEL_WARN);`
	`514`	`+ fallback = true;`
	`515`	`+ }`
	`516`	`+`
	`517`	`+ if (fallback && !bRecursive)`
	`518`	`+ {`
	`519`	`+ Logger.Write("Couldn't find official news links, resorting to fallback url!");`
	`520`	`+ ParseArticles(m_altUrl, true);`
	`521`	`+ }`
	`522`	`+ else if (bRecursive)`
	`523`	`+ {`
	`524`	`+ Logger.Write("Fallback url failed, no news links found!");`
`495`	`525`	`}`
`496`	`526`	`}`
`497`	`527`	`}`
`@@ -524,7 +554,7 @@ public async void LoadAllIndexes()`
`524`	`554`	`if (newsStorage.ThumbnailImage == null)`
`525`	`555`	`{`
`526`	`556`	`newsStorage.ThumbnailUrl = "";`
`527`		`- newsStorage.ThumbnailUrlAlt = "https://i.imgur.com/dmpY0zQ.png";`
	`557`	`+ newsStorage.ThumbnailUrlAlt = m_altThumbnail;`
`528`	`558`	`newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrlAlt);`
`529`	`559`	`}`
`530`	`560`	`}`
`@@ -570,7 +600,7 @@ private async void LoadIndex()`
`570`	`600`	`if (newsStorage.ThumbnailImage == null)`
`571`	`601`	`{`
`572`	`602`	`newsStorage.ThumbnailUrl = "";`
`573`		`- newsStorage.ThumbnailUrlAlt = "https://i.imgur.com/dmpY0zQ.png";`
	`603`	`+ newsStorage.ThumbnailUrlAlt = m_altThumbnail;`
`574`	`604`	`newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrlAlt);`
`575`	`605`	`}`
`576`	`606`
`@@ -611,22 +641,34 @@ private async void LoadIndex()`
`611`	`641`
`612`	`642`	`private void PreviousBtn_Click(object sender, EventArgs e)`
`613`	`643`	`{`
`614`		`- LoadPreviousArticle();`
	`644`	`+ if (PreviousBtn.BackgroundImage != null)`
	`645`	`+ {`
	`646`	`+ LoadPreviousArticle();`
	`647`	`+ }`
`615`	`648`	`}`
`616`	`649`
`617`	`650`	`private void PreviousBtn_DoubleClick(object sender, EventArgs e)`
`618`	`651`	`{`
`619`		`- LoadPreviousArticle();`
	`652`	`+ if (PreviousBtn.BackgroundImage != null)`
	`653`	`+ {`
	`654`	`+ LoadPreviousArticle();`
	`655`	`+ }`
`620`	`656`	`}`
`621`	`657`
`622`	`658`	`private void NextBtn_Click(object sender, EventArgs e)`
`623`	`659`	`{`
`624`		`- LoadNextArticle();`
	`660`	`+ if (NextBtn.BackgroundImage != null)`
	`661`	`+ {`
	`662`	`+ LoadNextArticle();`
	`663`	`+ }`
`625`	`664`	`}`
`626`	`665`
`627`	`666`	`private void NextBtn_DoubleClick(object sender, EventArgs e)`
`628`	`667`	`{`
`629`		`- LoadNextArticle();`
	`668`	`+ if (NextBtn.BackgroundImage != null)`
	`669`	`+ {`
	`670`	`+ LoadNextArticle();`
	`671`	`+ }`
`630`	`672`	`}`
`631`	`673`
`632`	`674`	`private void ThumbnailImg_Click(object sender, EventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -1312,16 +1312,16 @@ private async void UpdatePopup_ButtonClickAccept(object sender, EventArgs e)`
`1312`	`1312`
`1313`	`1313`	`if (report.Succeeded)`
`1314`	`1314`	`{`
	`1315`	`+ NewsCtrl.ParseArticles(await Retrievers.GetNewsUrl());`
`1315`	`1316`	`UpdatePopup.HidePopup();`
`1316`	`1317`	`ProcessTmr.Start();`
`1317`	`1318`	`CheckForUpdates(true, false);`
`1318`	`1319`	`}`
`1319`		`- else if (report.FailReason != null)`
	`1320`	`+ else if (report.HasFailReason())`
`1320`	`1321`	`{`
	`1322`	`+ UpdatePopup.UpdateType = CRUpdate.UpdateLayouts.Fail;`
`1321`	`1323`	`Logger.Write(report.FailReason, LogLevel.LEVEL_ERROR);`
`1322`	`1324`	`}`
`1323`		`-`
`1324`		`- NewsCtrl.ParseArticles(await Retrievers.GetNewsUrl());`
`1325`	`1325`	`}`
`1326`	`1326`
`1327`	`1327`	`private async void UpdatePopup_ButtonClickDeny(object sender, EventArgs e)`