refactor: clean duplicated code + add message forwarding on support commands

Author: escalopa

script/innopolis.go

@@ -32,7 +32,6 @@ func (n *NodeIterator) Next() *html.Node {
 	n.current = n.current.NextSibling
 
 	return node
-
 }
 
 const (

telegram/internal/handler/admin.go

@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"context"
 	"strconv"
 
 	objs "github.com/SakoDroid/telego/objects"
@@ -11,11 +10,11 @@ import (
 // Respond to a user's feedback or bug report
 func (h *Handler) Respond(u *objs.Update) {
 	var (
-		chatID    = getChatID(u)
-		chatIDStr = strconv.Itoa(chatID)
+		chatID = getChatID(u)
+		ctx    = h.getChatCtx(chatID)
 	)
 
-	ch, closer, err := h.registerChannel(chatIDStr)
+	ch, closer, err := h.registerChannel(chatID)
 	if err != nil {
 		log.Errorf("Handler.Respond: register channel [%d] => %v", chatID, err)
 		return
@@ -28,8 +27,8 @@ func (h *Handler) Respond(u *objs.Update) {
 		return
 	}
 
-	// Read userChatID, messageID, username from the old message that will be replied to
-	userChatID, responseMessageID, _, ok := parseUserMessage(u.Message.ReplyToMessage.Text)
+	// Read userChatID, messageID, from the old message that will be replied to
+	userChatID, userMessageID, ok := parseUserMessage(u.Message.ReplyToMessage.Text)
 	if !ok {
 		h.simpleSend(chatID, respondInvalidMsg)
 		return
@@ -39,21 +38,16 @@ func (h *Handler) Respond(u *objs.Update) {
 	messageID := h.simpleSend(chatID, respondStart)
 	defer h.deleteMessage(chatID, messageID)
 
-	// Create new command context
-	ctx, cancel := context.WithTimeout(h.getChatCtx(chatID), inputTimeout)
-	defer cancel()
-
-	select {
-	case <-ctx.Done():
+	u = h.readInput(ctx, ch)
+	if u == nil {
 		return
-	case u = <-ch:
 	}
 
 	if h.isCancelOperation(chatID, u.Message.Text) {
 		return
 	}
 
-	h.reply(userChatID, u.Message.Text, responseMessageID)
+	h.reply(userChatID, u.Message.Text, userMessageID)
 	h.simpleSend(chatID, respondSuccess)
 }
 
@@ -74,11 +68,11 @@ func (h *Handler) GetSubscribers(u *objs.Update) {
 // SendAll broadcasts a message to all subscribers
 func (h *Handler) SendAll(u *objs.Update) {
 	var (
-		chatID    = getChatID(u)
-		chatIDStr = strconv.Itoa(chatID)
+		chatID = getChatID(u)
+		ctx    = h.getChatCtx(chatID)
 	)
 
-	ch, closer, err := h.registerChannel(chatIDStr)
+	ch, closer, err := h.registerChannel(chatID)
 	if err != nil {
 		log.Errorf("Handler.SendAll: register channel [%d] => %v", chatID, err)
 		return
@@ -89,13 +83,9 @@ func (h *Handler) SendAll(u *objs.Update) {
 	messageID := h.simpleSend(chatID, sendAllStart)
 	defer h.deleteMessage(chatID, messageID)
 
-	ctx1, cancel1 := context.WithTimeout(h.getChatCtx(chatID), inputTimeout)
-	defer cancel1()
-
-	select {
-	case <-ctx1.Done():
+	u = h.readInput(ctx, ch)
+	if u == nil {
 		return
-	case u = <-ch:
 	}
 
 	var (
@@ -111,19 +101,12 @@ func (h *Handler) SendAll(u *objs.Update) {
 	messageID = h.simpleSend(chatID, sendAllConfirm)
 	defer h.deleteMessage(chatID, messageID)
 
-	// Wait for confirmation message or timeout after 5 minutes
-	ctx2, cancel2 := context.WithTimeout(h.getChatCtx(chatID), inputTimeout)
-	defer cancel2()
-
-	select {
-	case <-ctx2.Done():
+	u = h.readInput(ctx, ch)
+	if u == nil {
 		return
-	case u = <-ch:
 	}
 
-	// Delete the bot message if the user sends the message or if the context times out
 	defer h.deleteMessage(chatID, u.Message.MessageId)
-
 	if h.isCancelOperation(chatID, u.Message.Text) {
 		return
 	}
@@ -138,11 +121,11 @@ func (h *Handler) SendAll(u *objs.Update) {
 	// Send message to all subscribers asynchronously
 	go func() {
 		for _, userChatID := range chatIDs {
-			if userChatID == chatID {
+			if userChatID == chatID { // Skip the owner
 				continue
 			}
 			h.simpleSend(userChatID, broadcastMessageText)
 		}
-		h.reply(chatID, sendAllSuccess, broadcastMessageID)
+		h.reply(chatID, sendAllSuccess, broadcastMessageID) // Notify the owner
 	}()
 }

telegram/internal/handler/handler.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"sync"
 
+	objs "github.com/SakoDroid/telego/objects"
+
 	"github.com/SakoDroid/telego"
 	app "github.com/escalopa/gopray/telegram/internal/application"
 	"github.com/escalopa/gopray/telegram/internal/domain"
@@ -100,6 +102,19 @@ func (h *Handler) processUnknown() {
 	}
 }
 
+// readInput reads the next input from the input channel or returns nil if the context is done.
+func (h *Handler) readInput(ctx context.Context, inputChan <-chan *objs.Update) *objs.Update {
+	ctx, cancel := context.WithTimeout(ctx, inputTimeout)
+	defer cancel()
+
+	select {
+	case <-ctx.Done():
+		return nil
+	case u := <-inputChan:
+		return u
+	}
+}
+
 func (h *Handler) Stop() {
 	h.bot.Stop()
 	h.uc.Close()

telegram/internal/handler/helper.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"context"
+	"strconv"
 	"time"
 
 	objs "github.com/SakoDroid/telego/objects"
@@ -61,13 +62,14 @@ func (h *Handler) replace(chatID int, messageID int) {
 	}
 }
 
-func (h *Handler) registerChannel(chatID string) (chan *objs.Update, func(), error) {
-	ch, err := h.bot.AdvancedMode().RegisterChannel(chatID, "message")
+func (h *Handler) registerChannel(chatID int) (chan *objs.Update, func(), error) {
+	chatIDStr := strconv.Itoa(chatID)
+	ch, err := h.bot.AdvancedMode().RegisterChannel(chatIDStr, "message")
 	closer := func() {
 		if ch == nil {
 			return
 		}
-		h.bot.AdvancedMode().UnRegisterChannel(chatID, "message")
+		h.bot.AdvancedMode().UnRegisterChannel(chatIDStr, "message")
 	}
 	return *ch, closer, err
 }

telegram/internal/handler/prayer.go

@@ -3,16 +3,20 @@ package handler
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
+	objs "github.com/SakoDroid/telego/objects"
 	log "github.com/catalystgo/logger/cli"
-
 	"github.com/escalopa/gopray/telegram/internal/domain"
-
-	objs "github.com/SakoDroid/telego/objects"
 	"github.com/olekukonko/tablewriter"
 )
 
+const (
+	// PrayerTimeFormat is the format of the prayer times
+	prayerTimeFormat = "15:04"
+)
+
 func (h *Handler) GetPrayers(u *objs.Update) {
 	chatID := getChatID(u)
 
@@ -92,18 +96,6 @@ func (h *Handler) GetPrayersByDate(u *objs.Update) {
 	messageID = r.Result.MessageId
 }
 
-const (
-	// PrayerTimeFormat is the format of the prayer times
-	prayerTimeFormat = "15:04"
-)
-
-type prayerTable string
-
-func (t *prayerTable) Write(p []byte) (n int, err error) {
-	*t += prayerTable(p)
-	return len(p), nil
-}
-
 // prayrify returns a string representation of the prayer times in a Markdown prayerTable format.
 // Example output:
 // Day 9 November 🕌
@@ -118,8 +110,8 @@ func (h *Handler) prayrify(chatID int, p *domain.PrayerTime) string {
 	script := h.getChatScript(chatID)
 
 	// Create a Markdown prayerTable with the prayer times
-	t := new(prayerTable)
-	tw := tablewriter.NewWriter(t)
+	writer := &strings.Builder{}
+	tw := tablewriter.NewWriter(writer)
 
 	data := [][]string{
 		{script.Fajr, p.Fajr.Format(prayerTimeFormat)},
@@ -139,10 +131,9 @@ func (h *Handler) prayrify(chatID int, p *domain.PrayerTime) string {
 	tw.Render()
 
 	formattedTable := fmt.Sprintf(prayerText,
-		script.PrayrifyTableDay,
 		p.Day.Day(),
 		script.GetMonthNames()[p.Day.Month()-1],
-		string(*t),
+		writer.String(),
 	)
 
 	return formattedTable