Skip to content

Added provider emote id in returned emote json #17

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added provider emote id in returned emote json #17

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions temotes/emote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
7 changes: 4 additions & 3 deletions temotes/providers/7tv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
}
7 changes: 4 additions & 3 deletions temotes/providers/bttv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
}
8 changes: 5 additions & 3 deletions temotes/providers/ffz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sort"
"temotes/temotes"
"time"
"strconv"
)

type FfzFetcher struct{}
Expand Down Expand Up @@ -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),
}
}
7 changes: 4 additions & 3 deletions temotes/providers/twitch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
}

Expand Down