Merge pull request #149 from systemli/adjust-put-telegram-api

✨ Streamline Telegram Configuration API
systemli · Oct 14, 2022 · 6ae8695 · 6ae8695
2 parents 1a54ef5 + 329516a
commit 6ae8695
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/internal/api/response/ticker.go b/internal/api/response/ticker.go
@@ -41,6 +41,7 @@ type Twitter struct {
 
 type Telegram struct {
 	Active      bool   `json:"active"`
+	Connected   bool   `json:"connected"`
 	BotUsername string `json:"bot_username"`
 	ChannelName string `json:"channel_name"`
 }
@@ -86,6 +87,7 @@ func TickerResponse(t storage.Ticker, config config.Config) Ticker {
 		},
 		Telegram: Telegram{
 			Active:      t.Telegram.Active,
+			Connected:   t.Telegram.Connected(),
 			BotUsername: config.TelegramBotUser.UserName,
 			ChannelName: t.Telegram.ChannelName,
 		},

diff --git a/internal/api/tickers.go b/internal/api/tickers.go
@@ -188,14 +188,17 @@ func (h *handler) PutTickerTelegram(c *gin.Context) {
 		return
 	}
 
-	var tg storage.Telegram
-	err = c.Bind(&tg)
+	var body storage.Telegram
+	err = c.Bind(&body)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, response.ErrorResponse(response.CodeNotFound, response.FormError))
 		return
 	}
 
-	ticker.Telegram = tg
+	ticker.Telegram.Active = body.Active
+	if body.ChannelName != "" {
+		ticker.Telegram.ChannelName = body.ChannelName
+	}
 
 	err = h.storage.SaveTicker(&ticker)
 	if err != nil {

diff --git a/internal/storage/ticker.go b/internal/storage/ticker.go
@@ -75,6 +75,10 @@ func (tg *Telegram) Reset() {
 	tg.ChannelName = ""
 }
 
+func (tg *Telegram) Connected() bool {
+	return tg.ChannelName != ""
+}
+
 type Mastodon struct {
 	Active      bool   `json:"active"`
 	Server      string `json:"server"`