.dockerignore

@@ -1,25 +0,0 @@
-### Go template
-# If you prefer the allow list template instead of the deny list, see community template:
-# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
-#
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-# Go workspace file
-go.work
-
-# Also ignore the Dockerfile
-Dockerfile

.github/workflows/build-latest-image.yml

@@ -1,30 +0,0 @@
-name: Build latest Docker image
-on:
-  push:
-    branches:
-      - master
-jobs:
-  docker:
-    permissions:
-      contents: read
-      packages: write
-    runs-on:
-      - ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ghcr.io/${{ github.actor }}/cfr_train_info_telegram_bot:latest

.idea/vcs.xml

@@ -9,11 +9,6 @@
       </inspection_tool>
     </profile>
   </component>
-  <component name="GitSharedSettings">
-    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
-      <list />
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>

Dockerfile

@@ -1,36 +0,0 @@
-FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
-
-FROM --platform=$BUILDPLATFORM golang:1.21-alpine AS build
-
-LABEL authors="kbruen"
-LABEL org.opencontainers.image.source=https://github.com/dancojocaru2000/CfrTrainInfoTelegramBot
-
-RUN apk add tzdata
-
-RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-RUN apk add zig@testing
-COPY --from=xx / /
-ARG TARGETPLATFORM
-ENV CGO_ENABLED=1
-
-WORKDIR /app
-
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
-
-COPY main.go ./
-COPY pkg ./pkg/
-ARG TARGETOS
-ARG TARGETARCH
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_CFLAGS="-D_LARGEFILE64_SOURCE" CC="zig cc -target $(xx-info march)-$(xx-info os)-$(xx-info libc)" CXX="zig c++ -target $(xx-info march)-$(xx-info os)-$(xx-info libc)" go build -o server && xx-verify server
-
-FROM scratch
-COPY --from=build /etc/ssl/certs /etc/ssl/certs
-COPY --from=build /usr/share/zoneinfo /usr/share/zoneinfo
-WORKDIR /app
-# COPY static ./static/
-COPY --from=build /app/server ./
-
-ENV DEBUG=false
-ENTRYPOINT [ "/app/server" ]

main.go

@@ -44,7 +44,7 @@ You may use ` + cancelCommand + ` to cancel any ongoing command.`
 You may also send the date as a message in the following formats: dd.mm.yyyy, m/d/yyyy, yyyy-mm-dd, UNIX timestamp.
 
 Keep in mind that, for night trains, this date might be yesterday.`
-	invalidDateMessage = "Invalid date. Please try again or use " + cancelCommand + " to cancel."
+	invalidDateMessage = "Invalid date. Please try again or us " + cancelCommand + " to cancel."
 )
 
 func main() {
@@ -59,13 +59,7 @@ func main() {
 		log.Fatal("ERROR: No bot token supplied; supply with CFR_BOT.TOKEN")
 	}
 
-	dbPath := os.Getenv("CFR_BOT.DB_PATH")
+	db, err := gorm.Open(sqlite.Open("bot_db.sqlite"), &gorm.Config{})
-	dbPath = strings.TrimSpace(dbPath)
-	if len(dbPath) == 0 {
-		dbPath = "bot_db.sqlite"
-	}
-	log.Printf("INFO : DB Path: %s\n", dbPath)
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{})
 	if err != nil {
 		panic(err)
 	}
@@ -263,7 +257,7 @@ func handler(ctx context.Context, b *tgBot.Bot, update *models.Update, subs *sub
 						},
 					}
 				} else {
-					log.Printf("DEBUG: Subscribed: chatID %d, trainNumber %s, date %s, groupIndex %d", update.CallbackQuery.Message.Chat.ID, trainNumber, date.Format("2006-01-02"), groupIndex)
+					// TODO: Update message to contain unsubscribe button
 					response = &handlers.HandlerResponse{
 						CallbackAnswer: &tgBot.AnswerCallbackQueryParams{
 							Text: fmt.Sprintf("Subscribed successfully!"),
@@ -293,7 +287,7 @@ func handler(ctx context.Context, b *tgBot.Bot, update *models.Update, subs *sub
 						},
 					}
 				} else {
-					log.Printf("DEBUG: Unsubscribed: chatID %d, trainNumber %s, date %s, groupIndex %d", update.CallbackQuery.Message.Chat.ID, trainNumber, date.Format("2006-01-02"), groupIndex)
+					// TODO: Update message to contain unsubscribe button
 					response = &handlers.HandlerResponse{
 						CallbackAnswer: &tgBot.AnswerCallbackQueryParams{
 							Text: fmt.Sprintf("Unsubscribed successfully!"),
@@ -307,9 +301,6 @@ func handler(ctx context.Context, b *tgBot.Bot, update *models.Update, subs *sub
 						},
 					}
 				}
-
-			default:
-				log.Printf("WARN : Unknown callback query method: %s", splitted[0])
 			}
 		}
 	}
@@ -343,7 +334,7 @@ func handleFindTrainStages(ctx context.Context, b *tgBot.Bot, update *models.Upd
 			groupIndex := -1
 
 			if len(commandParams) > 1 {
-				date, _ = utils.ParseDate(commandParams[1])
+				date, _ = time.Parse(time.RFC3339, commandParams[1])
 			}
 			if len(commandParams) > 2 {
 				groupIndex, _ = strconv.Atoi(commandParams[2])

pkg/handlers/findTrain.go

@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"context"
-	"dcdev.ro/CfrTrainInfoTelegramBot/pkg/utils"
 	"errors"
 	"fmt"
 	"log"
@@ -47,11 +46,6 @@ func HandleTrainNumberCommand(ctx context.Context, trainNumber string, date time
 			Message: &bot.SendMessageParams{
 				Text: fmt.Sprintf("The train %s was not found.", trainNumber),
 			},
-			ShouldUnsubscribe: func() bool {
-				now := time.Now().In(utils.Location)
-				midnightYesterday := time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, utils.Location)
-				return date.Before(midnightYesterday)
-			}(),
 		}, false
 	case errors.Is(err, api.ServerError):
 		log.Printf("ERROR: In handle train number: %s", err.Error())
@@ -59,11 +53,6 @@ func HandleTrainNumberCommand(ctx context.Context, trainNumber string, date time
 			Message: &bot.SendMessageParams{
 				Text: fmt.Sprintf("Unknown server error when searching for train %s.", trainNumber),
 			},
-			ShouldUnsubscribe: func() bool {
-				now := time.Now().In(utils.Location)
-				midnightYesterday := time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, utils.Location)
-				return date.Before(midnightYesterday)
-			}(),
 		}, false
 	default:
 		log.Printf("ERROR: In handle train number: %s", err.Error())
@@ -74,35 +63,6 @@ func HandleTrainNumberCommand(ctx context.Context, trainNumber string, date time
 		groupIndex = 0
 	}
 
-	shouldUnsubscribe := func() bool {
-		if groupIndex == -1 {
-			return false
-		}
-		if len(trainData.Groups) <= groupIndex {
-			groupIndex = 0
-		}
-		now := time.Now().In(utils.Location)
-		midnightYesterday := time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, utils.Location)
-		lastStation := trainData.Groups[groupIndex].
-			Stations[len(trainData.Groups[groupIndex].Stations)-1]
-		if now.After(lastStation.Arrival.
-			ScheduleTime.Add(time.Hour * 6)) {
-			return true
-		}
-		if trainData.Groups[groupIndex].
-			Status != nil && trainData.Groups[groupIndex].
-			Status.Station == lastStation.Name &&
-			trainData.Groups[groupIndex].Status.
-				State == "arrival" {
-			return true
-		}
-		if date.Before(midnightYesterday) {
-			return true
-		}
-
-		return false
-	}()
-
 	message := bot.SendMessageParams{}
 	if groupIndex == -1 {
 		message.Text = fmt.Sprintf("Train %s %s contains multiple groups. Please choose one.", trainData.Rank, trainData.Number)
@@ -137,68 +97,6 @@ func HandleTrainNumberCommand(ctx context.Context, trainNumber string, date time
 
 		messageText.WriteString(fmt.Sprintf("Date: %s\n", trainData.Date))
 		messageText.WriteString(fmt.Sprintf("Operator: %s\n", trainData.Operator))
-		nextStopIdx := -1
-		for i, station := range group.Stations {
-			if station.Arrival != nil && time.Now().Before(station.Arrival.ScheduleTime.Add(func() time.Duration {
-				if station.Arrival.Status != nil {
-					return time.Minute * time.Duration(station.Arrival.Status.Delay)
-				} else {
-					return time.Nanosecond * 0
-				}
-			}())) {
-				nextStopIdx = i
-				break
-			}
-			if station.Departure != nil && time.Now().Before(station.Departure.ScheduleTime.Add(func() time.Duration {
-				if station.Departure.Status != nil {
-					return time.Minute * time.Duration(station.Departure.Status.Delay)
-				} else {
-					return time.Nanosecond * 0
-				}
-			}())) {
-				nextStopIdx = i
-				break
-			}
-		}
-		if nextStopIdx != -1 {
-			nextStop := &group.Stations[nextStopIdx]
-			arrTime := func() *time.Time {
-				if nextStop.Arrival == nil {
-					return nil
-				}
-				if nextStop.Arrival.Status != nil {
-					result := nextStop.Arrival.ScheduleTime.Add(time.Minute * time.Duration(nextStop.Arrival.Status.Delay))
-					return &result
-				}
-				return &nextStop.Arrival.ScheduleTime
-			}()
-			if arrTime != nil && time.Now().Before(*arrTime) {
-				arrStr := "less than 1m"
-				arrDiff := arrTime.Sub(time.Now())
-				if arrDiff/time.Hour >= 1 {
-					arrStr = fmt.Sprintf("%dh%dm", arrDiff/time.Hour, (arrDiff%time.Hour)/time.Minute)
-				} else if arrDiff/time.Minute >= 1 {
-					arrStr = fmt.Sprintf("%dm", arrDiff/time.Minute)
-				}
-				messageText.WriteString(fmt.Sprintf("Next stop: %s, arriving in %s at %s\n", nextStop.Name, arrStr, arrTime.In(utils.Location).Format("15:04")))
-			} else {
-				depStr := "less than 1m"
-				depTime := nextStop.Departure.ScheduleTime.Add(func() time.Duration {
-					if nextStop.Departure.Status != nil {
-						return time.Minute * time.Duration(nextStop.Departure.Status.Delay)
-					} else {
-						return time.Nanosecond * 0
-					}
-				}())
-				depDiff := depTime.Sub(time.Now())
-				if depDiff/time.Hour >= 1 {
-					depStr = fmt.Sprintf("%dh%dm", depDiff/time.Hour, (depDiff%time.Hour)/time.Minute)
-				} else if depDiff/time.Minute >= 1 {
-					depStr = fmt.Sprintf("%dm", depDiff/time.Minute)
-				}
-				messageText.WriteString(fmt.Sprintf("Currently stopped at: %s, departing in %s at %s\n", nextStop.Name, depStr, depTime.In(utils.Location).Format("15:04")))
-			}
-		}
 		if group.Status != nil {
 			messageText.WriteString("Status: ")
 			if group.Status.Delay == 0 {
@@ -238,9 +136,7 @@ func HandleTrainNumberCommand(ctx context.Context, trainNumber string, date time
 			},
 		}
 		buttonKind := TrainInfoResponseButtonIncludeSub
-		if shouldUnsubscribe {
+		if isSubscribed {
-			buttonKind = TrainInfoResponseButtonExcludeSub
-		} else if isSubscribed {
 			buttonKind = TrainInfoResponseButtonIncludeUnsub
 		}
 		message.ReplyMarkup = GetTrainNumberCommandResponseButtons(trainData.Number, group.Stations[0].Departure.ScheduleTime, groupIndex, buttonKind)
@@ -257,8 +153,7 @@ func HandleTrainNumberCommand(ctx context.Context, trainNumber string, date time
 	}
 
 	return &HandlerResponse{
-		Message:           &message,
+		Message: &message,
-		ShouldUnsubscribe: shouldUnsubscribe,
 	}, true
 }
 

pkg/handlers/response.go

@@ -8,7 +8,6 @@ type HandlerResponse struct {
 	CallbackAnswer          *bot.AnswerCallbackQueryParams
 	MessageEdits            []*bot.EditMessageTextParams
 	MessageMarkupEdits      []*bot.EditMessageReplyMarkupParams
-	ShouldUnsubscribe       bool
 	Injected                struct {
 		ChatId    int64
 		MessageId int

pkg/subscriptions/subscriptions.go

@@ -98,14 +98,15 @@ func (sub *Subscriptions) DeleteSubscription(chatId int64, messageId int) (*SubD
 			break
 		}
 	}
-	var result SubData
+	var result *SubData
 	if deleteIndex != -1 {
-		result = datas[deleteIndex]
+		result = &SubData{}
+		*result = datas[deleteIndex]
 		datas[deleteIndex] = datas[len(datas)-1]
 		datas = datas[:len(datas)-1]
 
 		_, err := database.WriteDB(func(db *gorm.DB) (*gorm.DB, error) {
-			db.Delete(&result)
+			db.Delete(result)
 			return db, db.Error
 		})
 		if err != nil {
@@ -119,11 +120,11 @@ func (sub *Subscriptions) DeleteSubscription(chatId int64, messageId int) (*SubD
 	} else {
 		sub.data[chatId] = datas
 	}
-	return &result, nil
+	return result, nil
 }
 
 func (sub *Subscriptions) CheckSubscriptions(ctx context.Context) {
-	ticker := time.NewTicker(time.Second * 45)
+	ticker := time.NewTicker(time.Second * 90)
 
 	sub.executeChecks(ctx)
 	for {
@@ -141,110 +142,54 @@ type workerData struct {
 	data  SubData
 }
 
-type unsubscribe struct {
-	chatId    int64
-	messageId int
-}
-
-type workerResponseData struct {
-	unsubscribe *unsubscribe
-}
-
 func (sub *Subscriptions) executeChecks(ctx context.Context) {
 	sub.mutex.RLock()
+	defer sub.mutex.RUnlock()
 
 	// Only allow 8 concurrent requests
 	// TODO: Make configurable instead of hardcoded
 	workerCount := 8
 	workerChan := make(chan workerData, workerCount)
-	responseChan := make(chan *workerResponseData, workerCount)
+	wg := &sync.WaitGroup{}
-	defer close(responseChan)
 	for i := 0; i < workerCount; i++ {
-		go checkWorker(ctx, workerChan, responseChan)
+		wg.Add(1)
+		go checkWorker(ctx, workerChan, wg)
 	}
 
-	go func() {
-		for _, datas := range sub.data {
-			for i := range datas {
-				workerChan <- workerData{
-					tgBot: sub.tgBot,
-					data:  datas[i],
-				}
-			}
-		}
-		close(workerChan)
-	}()
-
-	responses := make([]*workerResponseData, 0, len(sub.data))
-
 	for _, datas := range sub.data {
-		for range datas {
+		for i := range datas {
-			if resp := <-responseChan; resp != nil && resp.unsubscribe != nil {
+			workerChan <- workerData{
-				responses = append(responses, resp)
+				tgBot: sub.tgBot,
-			}
+				data:  datas[i],
-		}
-	}
-
-	sub.mutex.RUnlock()
-
-	for i := range responses {
-		if responses[i].unsubscribe != nil {
-			// Ignore error since this is optional optimisation
-			deletedSub, err := sub.DeleteSubscription(responses[i].unsubscribe.chatId, responses[i].unsubscribe.messageId)
-			if err == nil && deletedSub != nil {
-				_, _ = sub.tgBot.EditMessageReplyMarkup(ctx, &bot.EditMessageReplyMarkupParams{
-					ChatID:      responses[i].unsubscribe.chatId,
-					MessageID:   responses[i].unsubscribe.messageId,
-					ReplyMarkup: handlers.GetTrainNumberCommandResponseButtons(deletedSub.TrainNumber, deletedSub.Date, deletedSub.GroupIndex, handlers.TrainInfoResponseButtonExcludeSub),
-				})
 			}
 		}
 	}
+	close(workerChan)
+	wg.Wait()
 }
 
-func checkWorker(ctx context.Context, workerChan <-chan workerData, responseChan chan<- *workerResponseData) {
+func checkWorker(ctx context.Context, workerChan <-chan workerData, wg *sync.WaitGroup) {
+	defer wg.Done()
 	for wData := range workerChan {
-		func() {
+		data := wData.data
-			var response *workerResponseData
+		log.Printf("DEBUG: Timer tick, update for chat %d, train %s, date %s, group %d", data.ChatId, data.TrainNumber, data.Date.Format("2006-01-02"), data.GroupIndex)
-			defer func() {
-				responseChan <- response
-			}()
-			data := wData.data
-			log.Printf("DEBUG: Timer tick, update for chat %d, train %s, date %s, group %d", data.ChatId, data.TrainNumber, data.Date.Format("2006-01-02"), data.GroupIndex)
 
-			resp, ok := handlers.HandleTrainNumberCommand(ctx, data.TrainNumber, data.Date, data.GroupIndex, true)
+		resp, ok := handlers.HandleTrainNumberCommand(ctx, data.TrainNumber, data.Date, data.GroupIndex, true)
 
-			if !ok || resp == nil || resp.Message == nil {
+		if !ok || resp == nil || resp.Message == nil {
-				// Silently discard update errors
+			// Silently discard update errors
-				log.Printf("DEBUG: Error when updating chat %d, train %s, date %s, group %d", data.ChatId, data.TrainNumber, data.Date.Format("2006-01-02"), data.GroupIndex)
+			log.Printf("DEBUG: Error when updating chat %d, train %s, date %s, group %d", data.ChatId, data.TrainNumber, data.Date.Format("2006-01-02"), data.GroupIndex)
-				if resp != nil && resp.ShouldUnsubscribe {
+			return
-					response = &workerResponseData{
+		}
-						unsubscribe: &unsubscribe{
-							chatId:    data.ChatId,
-							messageId: data.MessageId,
-						},
-					}
-				}
-				return
-			}
 
-			_, _ = wData.tgBot.EditMessageText(ctx, &bot.EditMessageTextParams{
+		_, _ = wData.tgBot.EditMessageText(ctx, &bot.EditMessageTextParams{
-				ChatID:                data.ChatId,
+			ChatID:                data.ChatId,
-				MessageID:             data.MessageId,
+			MessageID:             data.MessageId,
-				Text:                  resp.Message.Text,
+			Text:                  resp.Message.Text,
-				ParseMode:             resp.Message.ParseMode,
+			ParseMode:             resp.Message.ParseMode,
-				Entities:              resp.Message.Entities,
+			Entities:              resp.Message.Entities,
-				DisableWebPagePreview: resp.Message.DisableWebPagePreview,
+			DisableWebPagePreview: resp.Message.DisableWebPagePreview,
-				ReplyMarkup:           resp.Message.ReplyMarkup,
+			ReplyMarkup:           resp.Message.ReplyMarkup,
-			})
+		})
-
-			response = &workerResponseData{}
-			if resp.ShouldUnsubscribe {
-				response.unsubscribe = &unsubscribe{
-					chatId:    data.ChatId,
-					messageId: data.MessageId,
-				}
-			}
-		}()
 	}
 }