From 70d67f2132916352fb57b92658d8aa664b744642 Mon Sep 17 00:00:00 2001 From: matyjb Date: Thu, 14 Sep 2023 18:19:26 +0200 Subject: [PATCH] added: provider emote id in emote json --- temotes/emote.go | 7 ++++--- temotes/providers/7tv.go | 7 ++++--- temotes/providers/bttv.go | 7 ++++--- temotes/providers/ffz.go | 8 +++++--- temotes/providers/twitch.go | 7 ++++--- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/temotes/emote.go b/temotes/emote.go index adce66c..f3489fb 100644 --- a/temotes/emote.go +++ b/temotes/emote.go @@ -24,7 +24,8 @@ type EmoteUrl struct { } type Emote struct { - Provider EmoteProvider `json:"provider"` - Code string `json:"code"` - Urls []EmoteUrl `json:"urls"` + ProviderEmoteID string `json:"provider_emote_id"` + Provider EmoteProvider `json:"provider"` + Code string `json:"code"` + Urls []EmoteUrl `json:"urls"` } diff --git a/temotes/providers/7tv.go b/temotes/providers/7tv.go index be66f29..2891fa9 100644 --- a/temotes/providers/7tv.go +++ b/temotes/providers/7tv.go @@ -76,8 +76,9 @@ func (t SevenTvFetcher) parseEmoteUrls(emote sevenTvEmote) []temotes.EmoteUrl { func (t SevenTvFetcher) parseEmote(emote sevenTvEmote) temotes.Emote { return temotes.Emote{ - Provider: temotes.Provider7tv, - Code: emote.Code, - Urls: t.parseEmoteUrls(emote), + ProviderEmoteID: emote.ID, + Provider: temotes.Provider7tv, + Code: emote.Code, + Urls: t.parseEmoteUrls(emote), } } diff --git a/temotes/providers/bttv.go b/temotes/providers/bttv.go index 763e354..4e4414a 100644 --- a/temotes/providers/bttv.go +++ b/temotes/providers/bttv.go @@ -82,8 +82,9 @@ func (t BttvFetcher) parseEmoteUrls(emote bttvEmote) []temotes.EmoteUrl { func (t BttvFetcher) parseEmote(emote bttvEmote) temotes.Emote { return temotes.Emote{ - Provider: temotes.ProviderBttv, - Code: emote.Code, - Urls: t.parseEmoteUrls(emote), + ProviderEmoteID: emote.ID, + Provider: temotes.ProviderBttv, + Code: emote.Code, + Urls: t.parseEmoteUrls(emote), } } diff --git a/temotes/providers/ffz.go b/temotes/providers/ffz.go index ba156d7..343d1f3 100644 --- a/temotes/providers/ffz.go +++ b/temotes/providers/ffz.go @@ -7,6 +7,7 @@ import ( "sort" "temotes/temotes" "time" + "strconv" ) type FfzFetcher struct{} @@ -90,8 +91,9 @@ func (t FfzFetcher) parseEmoteUrls(emote ffzEmote) []temotes.EmoteUrl { func (t FfzFetcher) parseEmote(emote ffzEmote) temotes.Emote { return temotes.Emote{ - Provider: temotes.ProviderFfz, - Code: emote.Code, - Urls: t.parseEmoteUrls(emote), + ProviderEmoteID: strconv.Itoa(emote.ID), + Provider: temotes.ProviderFfz, + Code: emote.Code, + Urls: t.parseEmoteUrls(emote), } } diff --git a/temotes/providers/twitch.go b/temotes/providers/twitch.go index 6059648..d2b2889 100644 --- a/temotes/providers/twitch.go +++ b/temotes/providers/twitch.go @@ -162,9 +162,10 @@ func (t TwitchFetcher) parseEmoteUrls(emote twitchEmote) []temotes.EmoteUrl { func (t TwitchFetcher) parseEmote(emote twitchEmote) temotes.Emote { return temotes.Emote{ - Provider: temotes.ProviderTwitch, - Code: emote.Code, - Urls: t.parseEmoteUrls(emote), + ProviderEmoteID: emote.ID, + Provider: temotes.ProviderTwitch, + Code: emote.Code, + Urls: t.parseEmoteUrls(emote), } }