broodjeaap/go-watch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed notifier interface/implementation

Browse source
This commit is contained in:
BroodjeAap 2022-12-10 09:14:19 +00:00
parent 8e0ce4bf48
commit c1b8a1055e
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.go
View file

@ -114,9 +114,9 @@ func (web *Web) initNotifiers() {
web.notifiers = make(map[string]notifiers.Notifier, 5) web.notifiers = make(map[string]notifiers.Notifier, 5)
if viper.IsSet("telegram") { if viper.IsSet("telegram") {
telegramBot := notifiers.TelegramNotifier{} telegramBot := notifiers.TelegramNotifier{}
telegramBot.Open() if telegramBot.Open() {
web.notifiers["Telegram"] = telegramBot web.notifiers["Telegram"] = &telegramBot
}
} }
} }
@ -124,6 +124,7 @@ func (web *Web) notify(notifierKey string, message string) {
notifier, exists := web.notifiers[notifierKey] notifier, exists := web.notifiers[notifierKey]
if !exists { if !exists {
log.Println("Could not find notifier with key:", notifierKey) log.Println("Could not find notifier with key:", notifierKey)
return
} }
notifier.Message(message) notifier.Message(message)
} }

10
notifiers/telegram.go
View file

@ -13,7 +13,7 @@ type TelegramNotifier struct {
Debug bool Debug bool
} }
func (telegram TelegramNotifier) Open() bool { func (telegram *TelegramNotifier) Open() bool {
bot, err := tgbotapi.NewBotAPI(viper.GetString("telegram.token")) bot, err := tgbotapi.NewBotAPI(viper.GetString("telegram.token"))
if err != nil { if err != nil {
log.Println("Could not start Telegram notifier:\n", err) log.Println("Could not start Telegram notifier:\n", err)
@ -25,8 +25,12 @@ func (telegram TelegramNotifier) Open() bool {
return true return true
} }
func (telegram TelegramNotifier) Message(message string) bool { func (telegram *TelegramNotifier) Message(message string) bool {
log.Println(telegram)
log.Println(message)
msg := tgbotapi.NewMessage(viper.GetInt64("telegram.chat"), message) msg := tgbotapi.NewMessage(viper.GetInt64("telegram.chat"), message)
log.Println(msg)
log.Println(telegram.Bot)
_, err := telegram.Bot.Send(msg) _, err := telegram.Bot.Send(msg)
if err != nil { if err != nil {
log.Println("Could not send Telegram message:\n", err) log.Println("Could not send Telegram message:\n", err)
@ -35,6 +39,6 @@ func (telegram TelegramNotifier) Message(message string) bool {
return true return true
} }
func (telegram TelegramNotifier) Close() bool { func (telegram *TelegramNotifier) Close() bool {
return true return true
} }

2
scraping.go
View file

@ -779,7 +779,7 @@ func notifyFilter(filters []Filter, filter *Filter, watch *Watch, web *Web, debu
if debug { if debug {
log.Println(buffer.String()) log.Println(buffer.String())
} else { } else {
web.notify("telegram", buffer.String()) web.notify("Telegram", buffer.String())
} }
} }