feat: refactor telegram usernames (#5)

* feat: refactor telegram usernames * fix: fixed unsubscribing on Telegram * chore: fix compile * fix: remove notifier from the database correctly
QuokkaStake · Aug 3, 2023 · 7392302 · 7392302
1 parent ca5fd72
commit 7392302
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/pkg/database/database.go b/pkg/database/database.go
@@ -278,16 +278,16 @@ func (d *Database) RemoveNotifier(
 	chain string,
 	operatorAddress string,
 	reporter constants.ReporterName,
-	notifier string,
+	userID string,
 ) error {
 	d.MaybeMutexLock()
 	defer d.MaybeMutexUnlock()
 
 	_, err := d.client.Exec(
-		"DELETE FROM notifiers WHERE operator_address = $1 AND reporter = $2 AND notifier = $3 AND chain = $4",
+		"DELETE FROM notifiers WHERE operator_address = $1 AND reporter = $2 AND user_id = $3 AND chain = $4",
 		operatorAddress,
 		reporter,
-		notifier,
+		userID,
 		chain,
 	)
 	if err != nil {

diff --git a/pkg/reporters/telegram/subscribe.go b/pkg/reporters/telegram/subscribe.go
@@ -18,6 +18,13 @@ func (reporter *Reporter) HandleSubscribe(c tele.Context) error {
 
 	reporter.MetricsManager.LogReporterQuery(reporter.Config.Name, constants.TelegramReporterName, "subscribe")
 
+	username := c.Sender().Username
+	if username == "" {
+		username = c.Sender().FirstName
+	} else {
+		username = "@" + username
+	}
+
 	args := strings.Split(c.Text(), " ")
 	if len(args) < 2 {
 		return reporter.BotReply(c, html.EscapeString(fmt.Sprintf(
@@ -41,7 +48,7 @@ func (reporter *Reporter) HandleSubscribe(c tele.Context) error {
 		address,
 		reporter.Name(),
 		strconv.FormatInt(c.Sender().ID, 10),
-		c.Sender().Username,
+		username,
 	)
 
 	if !added {

diff --git a/pkg/reporters/telegram/telegram.go b/pkg/reporters/telegram/telegram.go
@@ -249,9 +249,9 @@ func (reporter *Reporter) SerializeNotifiers(notifiers []*types.Notifier) string
 }
 
 func (reporter *Reporter) SerializeNotifier(notifier *types.Notifier) string {
-	if strings.HasPrefix(notifier.UserName, "@") {
-		return notifier.UserName
-	}
-
-	return "@" + notifier.UserName
+	return fmt.Sprintf(
+		"<a href=\"tg://user?id=%s\">%s</a>",
+		notifier.UserID,
+		notifier.UserName,
+	)
 }
diff --git a/pkg/reporters/telegram/unsubscribe.go b/pkg/reporters/telegram/unsubscribe.go
@@ -35,7 +35,7 @@ func (reporter *Reporter) HandleUnsubscribe(c tele.Context) error {
 		))
 	}
 
-	removed := reporter.Manager.RemoveNotifier(address, reporter.Name(), c.Sender().Username)
+	removed := reporter.Manager.RemoveNotifier(address, reporter.Name(), fmt.Sprintf("%d", c.Sender().ID))
 
 	if !removed {
 		return reporter.BotReply(c, "You are not subscribed to this validator's notifications")