Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix emote provider network error handler assuming an HTTP status code exists #1239

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Fix emote provider network error handler assuming an HTTP status code exists #1239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions TwitchDownloaderCore/TwitchHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,15 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> co
}
catch (HttpRequestException e)
{
logger.LogError($"BetterTTV returned HTTP {e.StatusCode}. BTTV emotes may not be present for this session.");
var message = e.StatusCode != null
? $"BetterTTV returned HTTP {e.StatusCode}."
: e.Message;

logger.LogError($"{message} Some BTTV emotes may not be present for this session.");
}
catch (TaskCanceledException ex) when (ex.Message.Contains("HttpClient.Timeout"))
{
logger.LogError("BetterTTV timed out. Some BTTV emotes may not be present for this session.");
}
}

Expand All @@ -416,7 +424,15 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> co
}
catch (HttpRequestException e)
{
logger.LogError($"FFZ returned HTTP {e.StatusCode}. FFZ emotes may not be present for this session.");
var message = e.StatusCode != null
? $"FFZ returned HTTP {e.StatusCode}."
: e.Message;

logger.LogError($"{message} Some FFZ emotes may not be present for this session.");
}
catch (TaskCanceledException ex) when (ex.Message.Contains("HttpClient.Timeout"))
{
logger.LogError("FFZ timed out. Some FFZ emotes may not be present for this session.");
}
}

Expand All @@ -428,7 +444,15 @@ public static async Task<List<TwitchEmote>> GetThirdPartyEmotes(List<Comment> co
}
catch (HttpRequestException e)
{
logger.LogError($"7TV returned HTTP {e.StatusCode}. 7TV emotes may not be present for this session.");
var message = e.StatusCode != null
? $"7TV returned HTTP {e.StatusCode}."
: e.Message;

logger.LogError($"{message} Some 7TV emotes may not be present for this session.");
}
catch (TaskCanceledException ex) when (ex.Message.Contains("HttpClient.Timeout"))
{
logger.LogError("7TV timed out. Some 7TV emotes may not be present for this session.");
}
}

Expand Down
Loading