luzifer/twitch-bot
1
0
Fork 0
mirror of https://github.com/Luzifer/twitch-bot.git synced 2024-11-08 16:20:02 +00:00
Code Issues Projects Releases Wiki Activity

[core] Ensure channel has correct format in access service

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2023-03-15 21:27:00 +01:00
parent 990060ce41
commit 4c7697261b
Signed by: luzifer
GPG key ID: D91C3E91E4CAD6F5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/service/access/access.go
View file

@ -57,7 +57,7 @@ func (s Service) GetChannelPermissions(channel string) ([]string, error) {
perm extendedPermission perm extendedPermission
) )
if err = s.db.DB().First(&perm, "channel = ?", channel).Error; err != nil { if err = s.db.DB().First(&perm, "channel = ?", strings.TrimLeft(channel, "#")).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil return nil, nil
} }
@ -143,7 +143,7 @@ func (s Service) GetTwitchClientForChannel(channel string, cfg ClientConfig) (*t
perm extendedPermission perm extendedPermission
) )
if err = s.db.DB().First(&perm, "channel = ?", channel).Error; err != nil { if err = s.db.DB().First(&perm, "channel = ?", strings.TrimLeft(channel, "#")).Error; err != nil {
return nil, errors.Wrap(err, "getting twitch credential from database") return nil, errors.Wrap(err, "getting twitch credential from database")
} }
@ -211,7 +211,7 @@ func (s Service) ListPermittedChannels() ([]string, error) {
func (s Service) RemoveExendedTwitchCredentials(channel string) error { func (s Service) RemoveExendedTwitchCredentials(channel string) error {
return errors.Wrap( return errors.Wrap(
s.db.DB().Delete(&extendedPermission{}, "channel = ?", channel).Error, s.db.DB().Delete(&extendedPermission{}, "channel = ?", strings.TrimLeft(channel, "#")).Error,
"deleting data from table", "deleting data from table",
) )
} }
@ -232,7 +232,7 @@ func (s Service) SetBotTwitchCredentials(accessToken, refreshToken string) (err
func (s Service) SetBotUsername(channel string) (err error) { func (s Service) SetBotUsername(channel string) (err error) {
return errors.Wrap( return errors.Wrap(
s.db.StoreCoreMeta(coreMetaKeyBotUsername, channel), s.db.StoreCoreMeta(coreMetaKeyBotUsername, strings.TrimLeft(channel, "#")),
"storing bot username", "storing bot username",
) )
} }
@ -251,7 +251,7 @@ func (s Service) SetExtendedTwitchCredentials(channel, accessToken, refreshToken
Columns: []clause.Column{{Name: "channel"}}, Columns: []clause.Column{{Name: "channel"}},
DoUpdates: clause.AssignmentColumns([]string{"access_token", "refresh_token", "scopes"}), DoUpdates: clause.AssignmentColumns([]string{"access_token", "refresh_token", "scopes"}),
}).Create(extendedPermission{ }).Create(extendedPermission{
Channel: channel, Channel: strings.TrimLeft(channel, "#"),
AccessToken: accessToken, AccessToken: accessToken,
RefreshToken: refreshToken, RefreshToken: refreshToken,
Scopes: strings.Join(scope, " "), Scopes: strings.Join(scope, " "),