Fix NRE caused by 4867ddb, fix catch block in TwitchHelper

lay295 · Nov 28, 2022 · 552ba3b · 552ba3b
1 parent bc9d090
commit 552ba3b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/TwitchDownloaderCore/ChatDownloader.cs b/TwitchDownloaderCore/ChatDownloader.cs
@@ -340,15 +340,15 @@ public async Task DownloadAsync(IProgress<ProgressReport> progress, Cancellation
                 progress.Report(new ProgressReport() { reportType = ReportType.Status, data = "Downloading + Embedding Images" });
                 chatRoot.embeddedData = new EmbeddedData();
 
-                List<TwitchEmote> thirdPartyEmotes = new List<TwitchEmote>();
-                List<TwitchEmote> firstPartyEmotes = new List<TwitchEmote>();
-                List<ChatBadge> twitchBadges = new List<ChatBadge>();
-                List<CheerEmote> twitchBits = new List<CheerEmote>();
+                List<EmbedEmoteData> thirdPartyReturnList = new List<EmbedEmoteData>();
+                List<EmbedEmoteData> firstPartyReturnList = new List<EmbedEmoteData>();
+                List<EmbedChatBadge> badgesReturnList = new List<EmbedChatBadge>();
+                List<EmbedCheerEmote> bitsReturnList = new List<EmbedCheerEmote>();
 
-                thirdPartyEmotes = await TwitchHelper.GetThirdPartyEmotes(chatRoot.streamer.id, downloadOptions.TempFolder, bttv: downloadOptions.BttvEmotes, ffz: downloadOptions.FfzEmotes, stv: downloadOptions.StvEmotes);
-                firstPartyEmotes = await TwitchHelper.GetEmotes(comments, downloadOptions.TempFolder);
-                twitchBadges = await TwitchHelper.GetChatBadges(chatRoot.streamer.id, downloadOptions.TempFolder);
-                twitchBits = await TwitchHelper.GetBits(downloadOptions.TempFolder, chatRoot.streamer.id.ToString());
+                List<TwitchEmote> thirdPartyEmotes = await TwitchHelper.GetThirdPartyEmotes(chatRoot.streamer.id, downloadOptions.TempFolder, bttv: downloadOptions.BttvEmotes, ffz: downloadOptions.FfzEmotes, stv: downloadOptions.StvEmotes);
+                List<TwitchEmote> firstPartyEmotes = await TwitchHelper.GetEmotes(comments, downloadOptions.TempFolder);
+                List<ChatBadge> twitchBadges = await TwitchHelper.GetChatBadges(chatRoot.streamer.id, downloadOptions.TempFolder);
+                List<CheerEmote> twitchBits = await TwitchHelper.GetBits(downloadOptions.TempFolder, chatRoot.streamer.id.ToString());
 
                 foreach (TwitchEmote emote in thirdPartyEmotes)
                 {
@@ -359,8 +359,10 @@ public async Task DownloadAsync(IProgress<ProgressReport> progress, Cancellation
                     newEmote.name = emote.Name;
                     newEmote.width = emote.Width / emote.ImageScale;
                     newEmote.height = emote.Height / emote.ImageScale;
-                    chatRoot.embeddedData.thirdParty.Add(newEmote);
+                    thirdPartyReturnList.Add(newEmote);
                 }
+                chatRoot.embeddedData.thirdParty = thirdPartyReturnList;
+                thirdPartyReturnList.Clear();
                 foreach (TwitchEmote emote in firstPartyEmotes)
                 {
                     EmbedEmoteData newEmote = new EmbedEmoteData();
@@ -369,15 +371,19 @@ public async Task DownloadAsync(IProgress<ProgressReport> progress, Cancellation
                     newEmote.data = emote.ImageData;
                     newEmote.width = emote.Width / emote.ImageScale;
                     newEmote.height = emote.Height / emote.ImageScale;
-                    chatRoot.embeddedData.firstParty.Add(newEmote);
+                    firstPartyReturnList.Add(newEmote);
                 }
+                chatRoot.embeddedData.firstParty= firstPartyReturnList;
+                firstPartyReturnList.Clear();
                 foreach (ChatBadge badge in twitchBadges)
                 {
                     EmbedChatBadge newBadge = new EmbedChatBadge();
                     newBadge.name = badge.Name;
                     newBadge.versions = badge.VersionsData;
-                    chatRoot.embeddedData.twitchBadges.Add(newBadge);
+                    badgesReturnList.Add(newBadge);
                 }
+                chatRoot.embeddedData.twitchBadges = badgesReturnList;
+                badgesReturnList.Clear();
                 foreach (CheerEmote bit in twitchBits)
                 {
                     EmbedCheerEmote newBit = new EmbedCheerEmote();
@@ -394,8 +400,10 @@ public async Task DownloadAsync(IProgress<ProgressReport> progress, Cancellation
                         newEmote.height = emotePair.Value.Height / emotePair.Value.ImageScale;
                         newBit.tierList.Add(emotePair.Key, newEmote);
                     }
-                    chatRoot.embeddedData.twitchBits.Add(newBit);
+                    bitsReturnList.Add(newBit);
                 }
+                chatRoot.embeddedData.twitchBits = bitsReturnList;
+                bitsReturnList.Clear();
             }
 
             switch (downloadOptions.DownloadFormat)

diff --git a/TwitchDownloaderCore/TwitchHelper.cs b/TwitchDownloaderCore/TwitchHelper.cs
@@ -243,7 +243,7 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(int streamerId,
                         returnList.Add(newEmote);
                         alreadyAdded.Add(emoteData.name);
                     }
-                    catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
+                    catch { }
                 }
             }