add: merge branch 'master' into fix-urls

Author: d-Rickyy-b

internal/bot/models/user.go

@@ -12,5 +12,6 @@ type User struct {
 	FirstName   string       `json:"first_name"`
 	LastName    string       `json:"last_name"`
 	LangCode    string       `json:"language_code"`
+	DarkMode    bool         `json:"dark_mode" gorm:"default:1"`
 	PriceAgents []PriceAgent `json:"-"`
 }

internal/bot/pricehistory.go

@@ -2,6 +2,7 @@ package bot
 
 import (
 	"GoGeizhalsBot/internal/bot/models"
+	"GoGeizhalsBot/internal/database"
 	"GoGeizhalsBot/internal/geizhals"
 	"GoGeizhalsBot/internal/prometheus"
 	"bytes"
@@ -29,7 +30,8 @@ func showPriceHistoryHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 		return fmt.Errorf("showPriceHistoryHandler: failed to parse callback data: %w", parseErr)
 	}
 
-	dateRangeKeyboard, since := generateDateRangeKeyboard(priceagent, "03")
+	isDarkmode := database.GetDarkmode(ctx.EffectiveUser.Id)
+	dateRangeKeyboard, since := generateDateRangeKeyboard(priceagent, "03", isDarkmode)
 	markup := gotgbot.InlineKeyboardMarkup{
 		InlineKeyboard: [][]gotgbot.InlineKeyboardButton{
 			dateRangeKeyboard,
@@ -44,7 +46,7 @@ func showPriceHistoryHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 	}
 
 	buffer := bytes.NewBuffer([]byte{})
-	renderChart(priceagent, history, since, buffer)
+	renderChart(priceagent, history, since, buffer, isDarkmode)
 
 	_, _ = bot.DeleteMessage(ctx.EffectiveChat.Id, cb.Message.MessageId)
 
@@ -66,8 +68,20 @@ func updatePriceHistoryGraphHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 		return fmt.Errorf("updatePriceHistoryGraphHandler: failed to parse callback data: %w", parseErr)
 	}
 
+	darkMode := database.GetDarkmode(ctx.EffectiveUser.Id)
+	if menu.Extra != "" {
+		changeDarkmodeTo := menu.Extra
+		switch changeDarkmodeTo {
+		case "0":
+			darkMode = false
+		default:
+			darkMode = true
+		}
+	}
+	database.UpdateDarkMode(ctx.EffectiveUser.Id, darkMode)
+
 	dateRange := menu.SubMenu
-	dateRangeKeyboard, since := generateDateRangeKeyboard(priceagent, dateRange)
+	dateRangeKeyboard, since := generateDateRangeKeyboard(priceagent, dateRange, darkMode)
 
 	markup := gotgbot.InlineKeyboardMarkup{
 		InlineKeyboard: [][]gotgbot.InlineKeyboardButton{
@@ -83,7 +97,7 @@ func updatePriceHistoryGraphHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 	}
 
 	buffer := bytes.NewBuffer([]byte{})
-	renderChart(priceagent, history, since, buffer)
+	renderChart(priceagent, history, since, buffer, darkMode)
 
 	caption := fmt.Sprintf("%s\nFür welchen Zeitraum möchtest du die Preishistorie sehen?", bold(createLink(priceagent.EntityURL(), priceagent.Name)))
 	newPic := gotgbot.InputMediaPhoto{Media: buffer, Caption: caption, ParseMode: "HTML"}
@@ -95,12 +109,20 @@ func updatePriceHistoryGraphHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 }
 
 // generateDateRangeKeyboard generates the keyboard for the date range buttons below the pricehistory chart.
-func generateDateRangeKeyboard(priceagent models.PriceAgent, dateRange string) ([]gotgbot.InlineKeyboardButton, time.Time) {
+func generateDateRangeKeyboard(priceagent models.PriceAgent, dateRange string, isDarkmode bool) ([]gotgbot.InlineKeyboardButton, time.Time) {
+	themeButton := "🌑"
+	switchTheme := 1
+	if isDarkmode {
+		themeButton = "🌕"
+		switchTheme = 0
+	}
+
 	dateRangeKeyboard := []gotgbot.InlineKeyboardButton{
 		{Text: "1M", CallbackData: fmt.Sprintf("m05_01_%d", priceagent.ID)},
 		{Text: "3M", CallbackData: fmt.Sprintf("m05_03_%d", priceagent.ID)},
 		{Text: "6M", CallbackData: fmt.Sprintf("m05_06_%d", priceagent.ID)},
 		{Text: "12M", CallbackData: fmt.Sprintf("m05_12_%d", priceagent.ID)},
+		{Text: themeButton, CallbackData: fmt.Sprintf("m05_%s_%d_%d", dateRange, priceagent.ID, switchTheme)},
 	}
 
 	var since time.Time
@@ -118,34 +140,35 @@ func generateDateRangeKeyboard(priceagent models.PriceAgent, dateRange string) (
 		dateRangeKeyboard[3].Text = "🔘 12M"
 		since = time.Now().AddDate(0, -12, 0)
 	default:
-		return generateDateRangeKeyboard(priceagent, "03")
+		return generateDateRangeKeyboard(priceagent, "03", isDarkmode)
 	}
 	return dateRangeKeyboard, since
 }
 
 // renderChart renders a price history chart to the given writer.
-func renderChart(priceagent models.PriceAgent, history geizhals.PriceHistory, since time.Time, w io.Writer) {
+func renderChart(priceagent models.PriceAgent, history geizhals.PriceHistory, since time.Time, w io.Writer, darkmode bool) {
 	prometheus.GraphsRendered.Inc()
-	darkFontColor := drawing.ColorFromHex("c2c2c2")
-	fontColor := darkFontColor
-
-	darkChartBackgroundColor := drawing.ColorFromHex("161b2b")
-	chartBackgroundColor := darkChartBackgroundColor
-
-	darkRegressionColor := drawing.ColorFromHex("e8a71a")
-	regressionColor := darkRegressionColor
-
-	darkMainSeriesColor := drawing.ColorFromHex("2569d1")
-	mainSeriesColor := darkMainSeriesColor
-
-	darkLegendBackgroundColor := drawing.ColorFromHex("2d364f")
-	legendBackgroundColor := darkLegendBackgroundColor
+	var fontColor, chartBackgroundColor, regressionColor, mainSeriesColor, legendBackgroundColor, gridMajorStrokeColor, gridMinorStrokeColor drawing.Color
+
+	fontColor = chart.DefaultTextColor
+	chartBackgroundColor = chart.DefaultBackgroundColor
+	regressionColor = drawing.ColorFromHex("e8a71a")
+	mainSeriesColor = drawing.ColorFromHex("2569d1")
+	legendBackgroundColor = chart.DefaultBackgroundColor
+	gridMajorStrokeColor = drawing.Color{R: 192, G: 192, B: 192, A: 100}
+	gridMinorStrokeColor = drawing.Color{R: 192, G: 192, B: 192, A: 64}
+
+	if darkmode {
+		fontColor = drawing.ColorFromHex("c2c2c2")
+		chartBackgroundColor = drawing.ColorFromHex("161b2b")
+		legendBackgroundColor = drawing.ColorFromHex("2d364f")
+	}
 
 	mainSeries := chart.TimeSeries{
 		Name: priceagent.Name,
 		Style: chart.Style{
 			StrokeColor: mainSeriesColor,
-			StrokeWidth: 2,
+			StrokeWidth: 3,
 		},
 	}
 
@@ -188,7 +211,7 @@ func renderChart(priceagent models.PriceAgent, history geizhals.PriceHistory, si
 		InnerSeries: mainSeries,
 		Style: chart.Style{
 			StrokeColor:     regressionColor,
-			StrokeWidth:     2,
+			StrokeWidth:     3,
 			StrokeDashArray: []float64{5.0, 5.0},
 		},
 	}
@@ -198,17 +221,17 @@ func renderChart(priceagent models.PriceAgent, history geizhals.PriceHistory, si
 		FontColor: fontColor,
 	}
 
-	fontStyle := chart.Style{FontColor: fontColor}
+	fontStyle := chart.Style{FontColor: fontColor, FontSize: 12}
 
 	gridMajorStyle := chart.Style{
 		Hidden:      false,
-		StrokeColor: drawing.Color{R: 192, G: 192, B: 192, A: 100},
+		StrokeColor: gridMajorStrokeColor,
 		StrokeWidth: 0.5,
 	}
 
 	gridMinorStyle := chart.Style{
 		Hidden:      false,
-		StrokeColor: drawing.Color{R: 192, G: 192, B: 192, A: 64},
+		StrokeColor: gridMinorStrokeColor,
 		StrokeWidth: 0.5,
 	}
 
@@ -242,7 +265,8 @@ func renderChart(priceagent models.PriceAgent, history geizhals.PriceHistory, si
 	}
 	graph.Elements = []chart.Renderable{chart.Legend(&graph, chart.Style{
 		FillColor: legendBackgroundColor,
-		FontColor: fontColor,
+		FontColor: fontStyle.FontColor,
+		FontSize:  fontStyle.FontSize,
 	})}
 
 	renderErr := graph.Render(chart.PNG, w)

internal/bot/util.go

@@ -2,6 +2,7 @@ package bot
 
 import (
 	"GoGeizhalsBot/internal/bot/models"
+	"errors"
 	"fmt"
 	"html"
 	"strconv"
@@ -65,11 +66,14 @@ func generateEntityKeyboard(priceagents []models.PriceAgent, menuID string, numC
 }
 
 func parseIDFromCallbackData(callbackData string, prefix string) (int64, error) {
-	priceagentIDString := strings.TrimPrefix(callbackData, prefix)
+	priceagentIDString := callbackData
 	results := strings.Split(priceagentIDString, "_")
 
 	// get last element from results
-	priceagentIDString = results[len(results)-1]
+	if len(results) != 3 && len(results) != 4 {
+		return 0, errors.New("couldn't parse priceagent ID - wrong number of results")
+	}
+	priceagentIDString = results[2]
 
 	priceagentID, parseErr := strconv.Atoi(priceagentIDString)
 	if parseErr != nil {

internal/database/database.go

@@ -86,6 +86,23 @@ func CreateUser(user models.User) error {
 	return tx.Error
 }
 
+func GetDarkmode(userID int64) bool {
+	var user models.User
+	tx := db.Where("id = ?", userID).First(&user)
+	if tx.Error != nil {
+		log.Println(tx.Error)
+		return true
+	}
+	return user.DarkMode
+}
+
+func UpdateDarkMode(userID int64, darkMode bool) {
+	tx := db.Model(&models.User{}).Where("id = ?", userID).Update("dark_mode", darkMode)
+	if tx.Error != nil {
+		log.Println(tx.Error)
+	}
+}
+
 func GetAllUsers() []models.User {
 	var users []models.User
 	db.Find(&users)