From c9efdc2c16757999e4a0a486858906ad08e18666 Mon Sep 17 00:00:00 2001 From: dvdandroid <6277172+DVDAndroid@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:38:35 +0200 Subject: [PATCH 1/2] Fix incorrect LiveSince if API returned no game (streamer can stream without a category/game associated) --- internal/feed/twitch.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/feed/twitch.go b/internal/feed/twitch.go index 1ce9354..739d7d1 100644 --- a/internal/feed/twitch.go +++ b/internal/feed/twitch.go @@ -204,9 +204,11 @@ func fetchChannelFromTwitchTask(channel string) (TwitchChannel, error) { result.IsLive = true result.ViewersCount = channelShell.UserOrError.Stream.ViewersCount - if streamMetadata.UserOrNull != nil && streamMetadata.UserOrNull.Stream != nil && streamMetadata.UserOrNull.Stream.Game != nil { - result.Category = streamMetadata.UserOrNull.Stream.Game.Name - result.CategorySlug = streamMetadata.UserOrNull.Stream.Game.Slug + if streamMetadata.UserOrNull != nil && streamMetadata.UserOrNull.Stream != nil { + if streamMetadata.UserOrNull.Stream.Game != nil { + result.Category = streamMetadata.UserOrNull.Stream.Game.Name + result.CategorySlug = streamMetadata.UserOrNull.Stream.Game.Slug + } startedAt, err := time.Parse("2006-01-02T15:04:05Z", streamMetadata.UserOrNull.Stream.StartedAt) if err == nil { From 7bc9c704d14b9c844b830a74262b850db05b4640 Mon Sep 17 00:00:00 2001 From: dvdandroid <6277172+DVDAndroid@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:50:00 +0200 Subject: [PATCH 2/2] Don't render "empty" game category --- internal/assets/templates/twitch-channels.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/assets/templates/twitch-channels.html b/internal/assets/templates/twitch-channels.html index f053122..cce60e3 100644 --- a/internal/assets/templates/twitch-channels.html +++ b/internal/assets/templates/twitch-channels.html @@ -18,7 +18,9 @@ {{ .Name }} {{ if .Exists }} {{ if .IsLive }} - {{ .Category }} + {{ if .Category }} + {{ .Category }} + {{ end }}