Add telegram notification support #33

sohm22 · 2021-05-15T07:00:54Z

new flag to choose notifier between email and telegram ex :- --notifier-type telegram
add other flags to add telegram details --telegram-token --telegram-username
add telegram bot initialization and send notification functionality
update notification workflow
create document for telegram bot integration with covaccine-notifier
send telegram notification as file if message length exceeds 4096 characters
this PR addresses the issue Instead of Email can we notify to Whatsapp or Telegram #24

main.go

PrasadG193 · 2021-05-21T12:41:19Z

main.go

@@ -13,6 +13,7 @@ import (

 var (
 	pinCode, state, district, email, password, date, vaccine, fee string
+	notifier, tgApiToken, tgUsername                              string


Let's declare a interface Notifier which implements Send() method. We can have a separate package notifier for this. Let's refactor the notification workflow

pkg/notify/email.go

main.go

pkg/notify/telegram.go

PrasadG193 · 2021-05-30T08:52:29Z

pkg/notify/telegram.go

+	if len(body) > 4096 {
+		log.Printf("message body too long, trimming it")
+		body = body[:4095]
+	}


why do we need this?

when started notifier using state and district name
I have encountered error for message greater than 4096 characters.

Should we split and send messages into 2 parts? Or send message as a file?

search.go

README.md

main.go

PrasadG193 · 2021-05-30T12:11:39Z

I think we should add subcommand for each notifier type instead of adding flags, something like -

covaccine-notifier email --username --password ...
covaccine-notifier telegram --token ...

address review comments

PrasadG193 · 2021-05-31T17:05:59Z

README.md

+  covaccine-notifier [command]
+
+Available Commands:
+  email       Notify slots avaliability using email


Suggested change

email Notify slots avaliability using email

email Notify slots availability using email

PrasadG193 · 2021-05-31T17:08:23Z

README.md

+Available Commands:
+  email       Notify slots avaliability using email
+  help        Help about any command
+  telegram    Notify slots availability using telegram


Suggested change

telegram Notify slots availability using telegram

telegram Notify slots availability using Telegram

PrasadG193 · 2021-05-31T17:12:01Z

main.go

+		Use:   "telegram [FLAGS]",
+		Short: "Notify slots availability using telegram",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			notifierType = NotifierType(TelegramNotifierType)


I don't think we need to typecast, TelegramNotifierType and EmailNotifierType is already of type NotifierType

We can just initialize and pass notifier.Notifier as an arg to Run from here

PrasadG193 · 2021-05-31T17:12:40Z

main.go

+	EmailNotifierType    NotifierType = "email"
+	TelegramNotifierType NotifierType = "telegram"


Lets move this to notifier package

PrasadG193 · 2021-05-31T17:14:19Z

main.go

 func Run(args []string) error {
 	if err := checkFlags(); err != nil {
 		return err
 	}
-	if err := checkSlots(); err != nil {
+	notifier, err := getNotifier()


We can pass notify.Notifier as a arg to Run(). We don't need getNotifier()

PrasadG193 · 2021-05-31T17:16:28Z

pkg/notify/email.go

+)
+
+type Email struct {
+	Id   string


Suggested change

Id string

ID string

just a Go way of naming variables :)

PrasadG193 · 2021-05-31T17:17:14Z

pkg/notify/notify.go

@@ -0,0 +1,5 @@
+package notify
+
+type Notifier interface {


Please add a comment on exported functions and types. This applies to other changes as well

PrasadG193 · 2021-05-31T17:17:49Z

pkg/notify/telegram.go

+	log.Printf("Authorized on account %s", bot.Self.UserName)
+
+	u := tgbotapi.NewUpdate(0)
+	u.Timeout = 60


Please declare timeout value as const and use here

PrasadG193 · 2021-05-31T17:18:48Z

pkg/notify/telegram.go

+	if len(body) > 4096 {
+		log.Printf("message body too long, trimming it")
+		body = body[:4095]
+	}


Should we split and send messages into 2 parts? Or send message as a file?

PrasadG193 · 2021-05-31T17:19:29Z

search.go

+	if err := notifier.SendMessage(buf.String()); err != nil {
+		return err
+	}
+	return nil


Suggested change

if err := notifier.SendMessage(buf.String()); err != nil {

return err

}

return nil

return notifier.SendMessage(buf.String())

…racters add comment on exported functions

PrasadG193 · 2021-06-03T07:59:51Z

README.md

 ```

 **Note:** Gmail password won't work for 2FA enabled accounts. Follow [this](https://support.google.com/accounts/answer/185833?p=InvalidSecondFactor&visit_id=637554658548216477-2576856839&rd=1) guide to generate app token password and use it with `--password` arg 

+**Note:** For telegram bot integration with covaccine-notifier follow [this](./docs/telegram-integration.md).


Let's add a sub heading - Integration with Telegram

pkg/notify/telegram.go

Add telegram notification support

616fb02

PrasadG193 reviewed May 21, 2021

View reviewed changes

PrasadG193 mentioned this pull request May 21, 2021

Feature: Support mattermost notifier #31

Closed

refactor the notification workflow

46bde55

PrasadG193 reviewed May 30, 2021

View reviewed changes

README.md Outdated Show resolved Hide resolved

sohm22 added 4 commits May 30, 2021 14:52

resolve merge conflict

a81356b

resolve merge conflict-1

3d1f96e

create document for telegram bot integration with covaccine-notifier

726e1e4

Update README.md

f9aa7f4

PrasadG193 reviewed May 30, 2021

View reviewed changes

main.go Outdated Show resolved Hide resolved

main.go Outdated Show resolved Hide resolved

sohm22 added 2 commits May 31, 2021 17:56

add sub-command for each notifier

8d964f1

address review comments

remove new line character

a2e1942

sohm22 requested a review from PrasadG193 May 31, 2021 15:48

PrasadG193 reviewed May 31, 2021

View reviewed changes

sohm22 added 2 commits June 2, 2021 10:16

send telegram notification as file if message length exceeds 4096 cha…

454120b

…racters add comment on exported functions

update README.md

a2d6d22

sohm22 requested a review from PrasadG193 June 2, 2021 05:01

PrasadG193 reviewed Jun 5, 2021

View reviewed changes

address review comments

e21e3b1

sohm22 requested a review from PrasadG193 June 5, 2021 19:11

PrasadG193 approved these changes Jun 7, 2021

View reviewed changes

PrasadG193 merged commit 08e980e into PrasadG193:main Jun 7, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add telegram notification support #33

Add telegram notification support #33

sohm22 commented May 15, 2021 •

edited

Loading

PrasadG193 May 21, 2021

PrasadG193 May 30, 2021

sohm22 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 commented May 30, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 May 31, 2021

PrasadG193 Jun 3, 2021

	email Notify slots avaliability using email
	email Notify slots availability using email

	telegram Notify slots availability using telegram
	telegram Notify slots availability using Telegram

		EmailNotifierType NotifierType = "email"
		TelegramNotifierType NotifierType = "telegram"

Add telegram notification support #33

Add telegram notification support #33

Conversation

sohm22 commented May 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PrasadG193 commented May 30, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sohm22 commented May 15, 2021 •

edited

Loading