From 050dcbe72b2d58fb866415d19413e264175e0e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Rudowicz?= Date: Sun, 10 Mar 2024 23:30:15 +0100 Subject: [PATCH] Little refactoring --- main.go | 31 +------------------------------ telegram_utils.go | 35 +++++++++++++++++++++++++++++++++++ telegram_utils_test.go | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 30 deletions(-) create mode 100644 telegram_utils.go create mode 100644 telegram_utils_test.go diff --git a/main.go b/main.go index c7a8359..a58ed8d 100644 --- a/main.go +++ b/main.go @@ -21,33 +21,6 @@ const ( PersistenceFilename = "hs_wro_last_seen.bin" ) -type TgSender struct { - bot *tgbotapi.BotAPI - s SatelNameGetter - logger *log.Logger - chatIds []int64 -} - -func (self TgSender) Send(msg GenericMessage, tpl *template.Template) error { - if len(self.chatIds) == 0 { - return nil - } - message := msg.Format(tpl, self.s, self.logger) - for _, chatId := range self.chatIds { - toSend := tgbotapi.NewMessage(chatId, message) - toSend.ParseMode = "HTML" - _, err := self.bot.Send(toSend) - if err != nil { - return err - } - } - return nil -} - -func sendTgMessage(tgEvents chan GenericMessage, msg []satel.BasicEventElement, chatId int64) { - tgEvents <- GenericMessage{msg} -} - type RealSleeper struct { duration time.Duration } @@ -162,9 +135,7 @@ func main() { FilterByLastSeen(s.Events, &wg, &dataStore, log.New(os.Stderr, "FilterByLastSeen", log.Lmicroseconds)), &wg, allowedTypes, allowedIndexes) { logger.Print("Received change from SATEL: ", e) - for _, chatId := range chatIds { - sendTgMessage(tgEvents, e.BasicEvents, chatId) - } + tgEvents <- GenericMessage{e.BasicEvents} } close(tgEvents) diff --git a/telegram_utils.go b/telegram_utils.go new file mode 100644 index 0000000..0b48efe --- /dev/null +++ b/telegram_utils.go @@ -0,0 +1,35 @@ +package main + +import ( + "html/template" + "log" + + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" +) + +type TelegramBotSender interface { + Send(c tgbotapi.Chattable) (tgbotapi.Message, error) +} + +type TgSender struct { + bot TelegramBotSender + s SatelNameGetter + logger *log.Logger + chatIds []int64 +} + +func (self TgSender) Send(msg GenericMessage, tpl *template.Template) error { + if len(self.chatIds) == 0 { + return nil + } + message := msg.Format(tpl, self.s, self.logger) + for _, chatId := range self.chatIds { + toSend := tgbotapi.NewMessage(chatId, message) + toSend.ParseMode = "HTML" + _, err := self.bot.Send(toSend) + if err != nil { + return err + } + } + return nil +} diff --git a/telegram_utils_test.go b/telegram_utils_test.go new file mode 100644 index 0000000..aa5cfd9 --- /dev/null +++ b/telegram_utils_test.go @@ -0,0 +1,35 @@ +package main + +import ( + "html/template" + "io" + "log" + "testing" + + "git.sr.ht/~michalr/go-satel" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/stretchr/testify/assert" +) + +type MockTgBotAPI struct { + callCount int +} + +func (self *MockTgBotAPI) Send(c tgbotapi.Chattable) (tgbotapi.Message, error) { + self.callCount += 1 + return tgbotapi.Message{}, nil +} + +var ( + tgSenderMessageTest1 = satel.BasicEventElement{Type: satel.ArmedPartition, Index: 1, Value: true} +) + +func TestTelegramSender_NoChatIdsWontSendAnything(t *testing.T) { + a := assert.New(t) + tpl := template.Must(template.New("TelegramMessage").Parse("")) + mockBot := MockTgBotAPI{0} + + tested := TgSender{&mockBot, MockSatelNameGetter{"mockPart"}, log.New(io.Discard, "", 0), []int64{}} + tested.Send(GenericMessage{[]satel.BasicEventElement{tgSenderMessageTest1}}, tpl) + a.Equal(0, mockBot.callCount) +}