mirror of
https://git.sr.ht/~ashkeel/strimertul
synced 2024-09-20 02:00:49 +00:00
refactor: single key subscription function
This commit is contained in:
parent
4fdcb8f2ba
commit
a15393be70
7 changed files with 300 additions and 277 deletions
|
@ -93,6 +93,20 @@ func (mod *DBModule) Subscribe(fn kv.SubscriptionCallback, prefixes ...string) e
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (mod *DBModule) SubscribeKey(fn func(string), key string) error {
|
||||||
|
_, err := mod.makeRequest(kv.CmdSubscribePrefix, map[string]interface{}{"prefix": key})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
go mod.client.SetPrefixSubCallback(key, func(changedKey string, value string) {
|
||||||
|
if key != changedKey {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fn(value)
|
||||||
|
})
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (mod *DBModule) GetJSON(key string, dst interface{}) error {
|
func (mod *DBModule) GetJSON(key string, dst interface{}) error {
|
||||||
res, err := mod.GetKey(key)
|
res, err := mod.GetKey(key)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -134,8 +134,7 @@ func (s *Server) Listen() error {
|
||||||
restart := containers.NewRWSync(false)
|
restart := containers.NewRWSync(false)
|
||||||
exit := make(chan error)
|
exit := make(chan error)
|
||||||
go func() {
|
go func() {
|
||||||
err := s.db.Subscribe(func(key, value string) {
|
err := s.db.SubscribeKey(func(value string) {
|
||||||
if key == ServerConfigKey {
|
|
||||||
oldBind := s.Config.Bind
|
oldBind := s.Config.Bind
|
||||||
oldPassword := s.Config.KVPassword
|
oldPassword := s.Config.KVPassword
|
||||||
err := json.Unmarshal([]byte(value), &s.Config)
|
err := json.Unmarshal([]byte(value), &s.Config)
|
||||||
|
@ -159,7 +158,6 @@ func (s *Server) Listen() error {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}, ServerConfigKey)
|
}, ServerConfigKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
exit <- fmt.Errorf("error while handling subscription to HTTP config changes: %w", err)
|
exit <- fmt.Errorf("error while handling subscription to HTTP config changes: %w", err)
|
||||||
|
|
|
@ -92,7 +92,10 @@ func Register(manager *modules.Manager) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Subscribe for changes
|
// Subscribe for changes
|
||||||
go db.Subscribe(loyalty.update, "loyalty/")
|
err = db.Subscribe(loyalty.update, "loyalty/")
|
||||||
|
if err != nil {
|
||||||
|
logger.Error("could not setup loyalty reload subscription", zap.Error(err))
|
||||||
|
}
|
||||||
|
|
||||||
// Register module
|
// Register module
|
||||||
manager.Modules[modules.ModuleLoyalty] = loyalty
|
manager.Modules[modules.ModuleLoyalty] = loyalty
|
||||||
|
|
|
@ -154,15 +154,19 @@ func NewBot(api *Client, config BotConfig) *Bot {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
bot.logger.Error("failed to parse custom commands", zap.Error(err))
|
bot.logger.Error("failed to parse custom commands", zap.Error(err))
|
||||||
}
|
}
|
||||||
go api.db.Subscribe(bot.updateCommands, CustomCommandsKey)
|
err = api.db.SubscribeKey(bot.updateCommands, CustomCommandsKey)
|
||||||
go api.db.Subscribe(bot.handleWriteMessageRPC, WriteMessageRPC)
|
if err != nil {
|
||||||
|
bot.logger.Error("could not set-up bot command reload subscription", zap.Error(err))
|
||||||
|
}
|
||||||
|
err = api.db.SubscribeKey(bot.handleWriteMessageRPC, WriteMessageRPC)
|
||||||
|
if err != nil {
|
||||||
|
bot.logger.Error("could not set-up bot command reload subscription", zap.Error(err))
|
||||||
|
}
|
||||||
|
|
||||||
return bot
|
return bot
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) updateCommands(key, value string) {
|
func (b *Bot) updateCommands(value string) {
|
||||||
switch key {
|
|
||||||
case CustomCommandsKey:
|
|
||||||
err := func() error {
|
err := func() error {
|
||||||
b.mu.Lock()
|
b.mu.Lock()
|
||||||
defer b.mu.Unlock()
|
defer b.mu.Unlock()
|
||||||
|
@ -177,14 +181,10 @@ func (b *Bot) updateCommands(key, value string) {
|
||||||
b.logger.Error("failed to update custom commands templates", zap.Error(err))
|
b.logger.Error("failed to update custom commands templates", zap.Error(err))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) handleWriteMessageRPC(key, value string) {
|
func (b *Bot) handleWriteMessageRPC(value string) {
|
||||||
switch key {
|
|
||||||
case WriteMessageRPC:
|
|
||||||
b.Client.Say(b.config.Channel, value)
|
b.Client.Say(b.config.Channel, value)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) updateTemplates() error {
|
func (b *Bot) updateTemplates() error {
|
||||||
|
|
|
@ -66,9 +66,7 @@ func Register(manager *modules.Manager) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Listen for config changes
|
// Listen for config changes
|
||||||
go db.Subscribe(func(key, value string) {
|
err = db.SubscribeKey(func(value string) {
|
||||||
switch key {
|
|
||||||
case ConfigKey:
|
|
||||||
err := json.UnmarshalFromString(value, &config)
|
err := json.UnmarshalFromString(value, &config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("failed to unmarshal config", zap.Error(err))
|
logger.Error("failed to unmarshal config", zap.Error(err))
|
||||||
|
@ -82,7 +80,12 @@ func Register(manager *modules.Manager) error {
|
||||||
client.API = api
|
client.API = api
|
||||||
|
|
||||||
logger.Info("reloaded/updated Twitch API")
|
logger.Info("reloaded/updated Twitch API")
|
||||||
case BotConfigKey:
|
}, ConfigKey)
|
||||||
|
if err != nil {
|
||||||
|
client.logger.Error("could not setup twitch config reload subscription", zap.Error(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
err = db.SubscribeKey(func(value string) {
|
||||||
var twitchBotConfig BotConfig
|
var twitchBotConfig BotConfig
|
||||||
err := json.UnmarshalFromString(value, &twitchBotConfig)
|
err := json.UnmarshalFromString(value, &twitchBotConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -102,8 +105,10 @@ func Register(manager *modules.Manager) error {
|
||||||
}
|
}
|
||||||
client.restart <- true
|
client.restart <- true
|
||||||
logger.Info("reloaded/restarted Twitch bot")
|
logger.Info("reloaded/restarted Twitch bot")
|
||||||
|
}, BotConfigKey)
|
||||||
|
if err != nil {
|
||||||
|
client.logger.Error("could not setup twitch bot config reload subscription", zap.Error(err))
|
||||||
}
|
}
|
||||||
}, ConfigKey, BotConfigKey)
|
|
||||||
|
|
||||||
if config.Enabled {
|
if config.Enabled {
|
||||||
client.API, err = client.getHelixAPI()
|
client.API, err = client.getHelixAPI()
|
||||||
|
|
|
@ -111,8 +111,7 @@ func SetupAlerts(bot *Bot) *BotAlertsModule {
|
||||||
|
|
||||||
mod.compileTemplates()
|
mod.compileTemplates()
|
||||||
|
|
||||||
go bot.api.db.Subscribe(func(key, value string) {
|
err = bot.api.db.SubscribeKey(func(value string) {
|
||||||
if key == BotAlertsKey {
|
|
||||||
err := json.UnmarshalFromString(value, &mod.Config)
|
err := json.UnmarshalFromString(value, &mod.Config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
bot.logger.Debug("error reloading timer config", zap.Error(err))
|
bot.logger.Debug("error reloading timer config", zap.Error(err))
|
||||||
|
@ -120,8 +119,10 @@ func SetupAlerts(bot *Bot) *BotAlertsModule {
|
||||||
bot.logger.Info("reloaded alert config")
|
bot.logger.Info("reloaded alert config")
|
||||||
}
|
}
|
||||||
mod.compileTemplates()
|
mod.compileTemplates()
|
||||||
}
|
|
||||||
}, BotAlertsKey)
|
}, BotAlertsKey)
|
||||||
|
if err != nil {
|
||||||
|
bot.logger.Error("could not set-up bot alert reload subscription", zap.Error(err))
|
||||||
|
}
|
||||||
|
|
||||||
// Subscriptions are handled with a slight delay as info come from different events and must be aggregated
|
// Subscriptions are handled with a slight delay as info come from different events and must be aggregated
|
||||||
pendingSubs := make(map[string]subMixedEvent)
|
pendingSubs := make(map[string]subMixedEvent)
|
||||||
|
@ -234,8 +235,7 @@ func SetupAlerts(bot *Bot) *BotAlertsModule {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
go bot.api.db.Subscribe(func(key, value string) {
|
err = bot.api.db.SubscribeKey(func(value string) {
|
||||||
if key == EventSubEventKey {
|
|
||||||
var ev eventSubNotification
|
var ev eventSubNotification
|
||||||
err := json.UnmarshalFromString(value, &ev)
|
err := json.UnmarshalFromString(value, &ev)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -416,8 +416,10 @@ func SetupAlerts(bot *Bot) *BotAlertsModule {
|
||||||
// Compile template and send
|
// Compile template and send
|
||||||
writeTemplate(bot, tpl, &giftEv)
|
writeTemplate(bot, tpl, &giftEv)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}, EventSubEventKey)
|
}, EventSubEventKey)
|
||||||
|
if err != nil {
|
||||||
|
bot.logger.Error("could not setup twitch alert subscription", zap.Error(err))
|
||||||
|
}
|
||||||
|
|
||||||
bot.logger.Debug("loaded bot alerts")
|
bot.logger.Debug("loaded bot alerts")
|
||||||
|
|
||||||
|
|
|
@ -55,16 +55,17 @@ func SetupTimers(bot *Bot) *BotTimerModule {
|
||||||
bot.api.db.PutJSON(BotTimersKey, mod.Config)
|
bot.api.db.PutJSON(BotTimersKey, mod.Config)
|
||||||
}
|
}
|
||||||
|
|
||||||
go bot.api.db.Subscribe(func(key, value string) {
|
err = bot.api.db.SubscribeKey(func(value string) {
|
||||||
if key == BotTimersKey {
|
|
||||||
err := json.UnmarshalFromString(value, &mod.Config)
|
err := json.UnmarshalFromString(value, &mod.Config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
bot.logger.Debug("error reloading timer config", zap.Error(err))
|
bot.logger.Debug("error reloading timer config", zap.Error(err))
|
||||||
} else {
|
} else {
|
||||||
bot.logger.Info("reloaded timer config")
|
bot.logger.Info("reloaded timer config")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}, BotTimersKey)
|
}, BotTimersKey)
|
||||||
|
if err != nil {
|
||||||
|
bot.logger.Error("could not set-up timer reload subscription", zap.Error(err))
|
||||||
|
}
|
||||||
|
|
||||||
bot.logger.Debug("loaded timers", zap.Int("timers", len(mod.Config.Timers)))
|
bot.logger.Debug("loaded timers", zap.Int("timers", len(mod.Config.Timers)))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue