mirror of
https://github.com/Luzifer/twitch-bot.git
synced 2024-11-08 08:10:08 +00:00
[core] Ensure channel has correct format in access service
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
990060ce41
commit
4c7697261b
1 changed files with 5 additions and 5 deletions
|
@ -57,7 +57,7 @@ func (s Service) GetChannelPermissions(channel string) ([]string, error) {
|
|||
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) {
|
||||
return nil, nil
|
||||
}
|
||||
|
@ -143,7 +143,7 @@ func (s Service) GetTwitchClientForChannel(channel string, cfg ClientConfig) (*t
|
|||
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")
|
||||
}
|
||||
|
||||
|
@ -211,7 +211,7 @@ func (s Service) ListPermittedChannels() ([]string, error) {
|
|||
|
||||
func (s Service) RemoveExendedTwitchCredentials(channel string) error {
|
||||
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",
|
||||
)
|
||||
}
|
||||
|
@ -232,7 +232,7 @@ func (s Service) SetBotTwitchCredentials(accessToken, refreshToken string) (err
|
|||
|
||||
func (s Service) SetBotUsername(channel string) (err error) {
|
||||
return errors.Wrap(
|
||||
s.db.StoreCoreMeta(coreMetaKeyBotUsername, channel),
|
||||
s.db.StoreCoreMeta(coreMetaKeyBotUsername, strings.TrimLeft(channel, "#")),
|
||||
"storing bot username",
|
||||
)
|
||||
}
|
||||
|
@ -251,7 +251,7 @@ func (s Service) SetExtendedTwitchCredentials(channel, accessToken, refreshToken
|
|||
Columns: []clause.Column{{Name: "channel"}},
|
||||
DoUpdates: clause.AssignmentColumns([]string{"access_token", "refresh_token", "scopes"}),
|
||||
}).Create(extendedPermission{
|
||||
Channel: channel,
|
||||
Channel: strings.TrimLeft(channel, "#"),
|
||||
AccessToken: accessToken,
|
||||
RefreshToken: refreshToken,
|
||||
Scopes: strings.Join(scope, " "),
|
||||
|
|
Loading…
Reference in a new issue