Manage title and fallbacktext

Also, fix the mod for arrays of weekdays and months
cartabinaria · Nov 27, 2023 · 9324821 · 9324821
1 parent 0bee321
commit 9324821
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/bot/bot.go b/bot/bot.go
@@ -246,7 +246,7 @@ func executeCommand(bot *tgbotapi.BotAPI, update *tgbotapi.Update, commandIndex
 			msg := tgbotapi.NewMessage(update.Message.Chat.ID, update.Message.Text)
 			msg.ReplyMarkup = newCommand.Rows
 			if _, err := bot.Send(msg); err != nil {
-				msg = tgbotapi.NewMessage(update.Message.Chat.ID, "Error retrieving lectures")
+				msg = tgbotapi.NewMessage(update.Message.Chat.ID, "Error sending data")
 				bot.Send(msg)
 			}
 		}

diff --git a/bot/callbacks.go b/bot/callbacks.go
@@ -1,6 +1,7 @@
 package bot
 
 import (
+	"fmt"
 	"log"
 	"regexp"
 	"strconv"
@@ -57,12 +58,15 @@ func lecturesCallback(bot *tgbotapi.BotAPI, update *tgbotapi.Update, callback_te
 			log.Printf("Error [GetTimeTable]: %s\n", err)
 		}
 
+		if response == "" {
+			response = timetable.FallbackText
+		} else {
+			response = fmt.Sprintf(timetable.Title, timetable.Course, year, timeForLectures.Format("2006-01-02")) + "\n\n" + response
+		}
+
 		editConfig := tgbotapi.NewEditMessageText(chatId, messageId, response)
 		editConfig.ParseMode = tgbotapi.ModeHTML
 
-		if response == "" {
-			editConfig = tgbotapi.NewEditMessageText(chatId, messageId, "Non ci sono lezioni in questo giorno. SMETTILA DI PRESSARMI")
-		}
 		_, err = bot.Send(editConfig)
 		if err != nil {
 			log.Printf("Error [bot.Send() for the NewEditMessageText]: %s\n", err)

diff --git a/model/model.go b/model/model.go
@@ -112,10 +112,12 @@ type Curriculum struct {
 
 // Recognized by a callback string
 type Timetable struct {
-	Course     string `json:"course"`    // Course title
-	Name       string `json:"name"`      // Course name
-	Type       string `json:"type"`      // Type (laurea|magistrale|2cycle)
-	Curriculum string `json:"curricula"` // Curriculum
+	Course       string `json:"course"`    // Course title
+	Name         string `json:"name"`      // Course name
+	Type         string `json:"type"`      // Type (laurea|magistrale|2cycle)
+	Curriculum   string `json:"curricula"` // Curriculum
+	Title        string `json:"title"`
+	FallbackText string `json:"fallbackText"`
 }
 
 // SECTION ACTION STRUCTS DATA
@@ -150,7 +152,8 @@ type NotLookingForData struct {
 }
 
 type Lectures struct {
-	Description string `json:"description"`
+	Description  string `json:"description"`
+	FallbackText string `json:"fallbackText"`
 }
 
 type ListData struct {

diff --git a/model/timetables.go b/model/timetables.go
@@ -37,7 +37,7 @@ func ChooseTimetableDay(callback_text string) InlineKeyboardRows {
 	dt := time.Now()
 
 	for day := 0; day < 7; day++ {
-		rows[day] = tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData(fmt.Sprintf("%s %d %s", weekdays[dt.Weekday()], dt.Day(), months[dt.Month()]), fmt.Sprintf("%s_day_%d", callback_text, dt.Unix())))
+		rows[day] = tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData(fmt.Sprintf("%s %d %s", weekdays[dt.Weekday()%7], dt.Day(), months[dt.Month()%12]), fmt.Sprintf("%s_day_%d", callback_text, dt.Unix())))
 		dt = dt.AddDate(0, 0, 1)
 	}
 

diff --git a/model/timetables_test.go b/model/timetables_test.go
@@ -84,7 +84,7 @@ func TestChooseTimetableDay(t *testing.T) {
 	}
 
 	for day := 0; day < 7; day++ {
-		tests[0].want[day] = tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData(fmt.Sprintf("%s %d %s", weekdays[dt.Weekday()], dt.Day(), months[dt.Month()]), fmt.Sprintf("%s_day_%d", "lectures_lm_informatica_software_techniques", dt.Unix())))
+		tests[0].want[day] = tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData(fmt.Sprintf("%s %d %s", weekdays[dt.Weekday()%7], dt.Day(), months[dt.Month()%12]), fmt.Sprintf("%s_day_%d", "lectures_lm_informatica_software_techniques", dt.Unix())))
 		dt = dt.AddDate(0, 0, 1)
 	}
 	for _, tt := range tests {