Replace unix socket logic with go.balki.me/anyhttp

Now also support systemd socket activation

.gitignore

@@ -0,0 +1 @@
+tglistbot*

Makefile

@@ -0,0 +1,12 @@
+
+VERSION = $(shell git describe --tags --abbrev=0)
+
+build_release:
+	CGO_ENABLED=0 go build -buildmode=pie -ldflags "-X main.Version=$(VERSION)" -o tglistbot-$(VERSION)
+
+release_check:
+	go list -m go.balki.me/tglistbot@$(VERSION)
+
+clean:
+	rm -i tglistbot* || true
+

glist/glist.go

@@ -109,16 +109,24 @@ func (g *GList) ClearChecked() {
 	persistReqC <- g
 }
 
+type SendMethod string
+
+var (
+	NEWLIST  SendMethod = "sendMessage"
+	EDITLIST SendMethod = "editMessageText"
+)
+
 type button struct {
 	Text         string `json:"text"`
 	CallbackData string `json:"callback_data"`
 }
 
 type newListReq struct {
-	ChatID      int    `json:"chat_id"`
+	ChatID              int    `json:"chat_id"`
-	MessageID   *int   `json:"message_id,omitempty"`
+	MessageID           *int   `json:"message_id,omitempty"`
-	Text        string `json:"text"`
+	Text                string `json:"text"`
-	ReplyMarkup struct {
+	DisableNotification *bool  `json:"disable_notification,omitempty"`
+	ReplyMarkup         struct {
 		InlineKeyboard [][]button `json:"inline_keyboard"`
 	} `json:"reply_markup"`
 }
@@ -147,8 +155,12 @@ func makeButtons(items []Entry) [][]button {
 	return buttons
 }
 
-func (g *GList) GenSendListReq() ([]byte, error) {
+func (g *GList) GenSendListReq(method SendMethod) ([]byte, error) {
 	req := newListReq{ChatID: g.ChatID, MessageID: g.MessageID, Text: "List:"}
+	if method == NEWLIST {
+		disableNotification := true
+		req.DisableNotification = &disableNotification
+	}
 	itemButtons := makeButtons(g.Items)
 	controlButtons := []button{{"clear checked", "clear"}}
 	req.ReplyMarkup.InlineKeyboard = append(itemButtons, controlButtons)

glist/glist_test.go

@@ -7,12 +7,12 @@ import (
 
 func TestGList(t *testing.T) {
 	g := NewGList(4342, "foo")
-	data, err := g.GenSendListReq()
+	data, err := g.GenSendListReq(NEWLIST)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	expected := `{"chat_id":4342,"text":"List:","reply_markup":{"inline_keyboard":[[{"text":"foo","callback_data":"foo"}],[{"text":"clear checked","callback_data":"clear"}]]}}`
+	expected := `{"chat_id":4342,"text":"List:","disable_notification":true,"reply_markup":{"inline_keyboard":[[{"text":"foo","callback_data":"foo"}],[{"text":"clear checked","callback_data":"clear"}]]}}`
 	if expected != string(data) {
 		t.Fatalf("expected: %s\n got:%s\n", expected, string(data))
 	}

go.mod

@@ -1,3 +1,5 @@
 module go.balki.me/tglistbot
 
 go 1.20
+
+require go.balki.me/anyhttp v0.1.0

go.sum

@@ -0,0 +1,2 @@
+go.balki.me/anyhttp v0.1.0 h1:ULzLWS1pRWMEduHHJxXCbvxoTmxNaWSNANV9gQ0Pigw=
+go.balki.me/anyhttp v0.1.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s=

main.go

@@ -4,47 +4,47 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
-	"io/fs"
 	"log"
-	"net"
 	"net/http"
 	"os"
 	"path"
 	"runtime/debug"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"go.balki.me/anyhttp"
 	"go.balki.me/tglistbot/glist"
 )
 
+// Version will be set from build commandline
+var Version string
 var apiToken string
 
+var usage string = `Telegram List bot
+Environment variables:
+TGLB_API_TOKEN (required): See https://core.telegram.org/bots#how-do-i-create-a-bot
+TGLB_PORT (default 28923): Set numerical port or unix//run/path.sock for unix socket
+TGLB_DATA_PATH (default .): Directory path where list data is stored
+`
+
 func main() {
 
 	apiToken = os.Getenv("TGLB_API_TOKEN")
 
 	if apiToken == "" {
-		log.Panicln("TG_API_TOKEN is empty")
+		log.Print(usage)
+		log.Panicln("TGLB_API_TOKEN is empty")
 	}
 
-	port, unixSocketPath := func() (int, string) {
+	addr := func() string {
-		portStr := os.Getenv("TGLB_PORT")
+		addr := os.Getenv("TGLB_PORT")
-
+		if addr == "" {
-		defaultPort := 28923
+			return "28923"
-
-		if strings.HasPrefix(portStr, "unix/") {
-			return defaultPort, strings.TrimPrefix(portStr, "unix/")
 		}
-
+		return addr
-		if port, err := strconv.Atoi(portStr); err == nil {
-			return port, ""
-		}
-		return defaultPort, ""
 	}()
 
 	dataPath := func() string {
@@ -61,7 +61,10 @@ func main() {
 
 	glist.DataPath = dataPath
 
-	commit := func() string {
+	version := func() string {
+		if Version != "" {
+			return Version
+		}
 		if bi, ok := debug.ReadBuildInfo(); ok {
 			for _, s := range bi.Settings {
 				if s.Key == "vcs.revision" {
@@ -72,14 +75,7 @@ func main() {
 		return "unknown"
 	}()
 
-	listeningOn := func() string {
+	log.Printf("List bot (%s) starting with datapath: %q, %s\n", version, dataPath, addr)
-		if unixSocketPath != "" {
-			return fmt.Sprintf("socket: %q", unixSocketPath)
-		}
-		return fmt.Sprintf("port: %v", port)
-	}()
-
-	log.Printf("List bot (%s) starting with datapath: %q, %s\n", commit, dataPath, listeningOn)
 
 	var chats sync.Map
 	if err := loadData(dataPath, &chats); err != nil {
@@ -147,24 +143,7 @@ func main() {
 
 		}
 	})
-	if unixSocketPath != "" {
+	log.Panicln(anyhttp.ListenAndServe(addr, nil))
-		// Remove old one
-		if err := os.Remove(unixSocketPath); err != nil && !errors.Is(err, fs.ErrNotExist) {
-			log.Panicf("Failed to remove unix socket : %q err: %v\n", unixSocketPath, err)
-		}
-
-		l, err := net.Listen("unix", unixSocketPath)
-		if err != nil {
-			log.Panicf("Unable to listen to unix socket : %q err: %v\n", unixSocketPath, err)
-		}
-
-		if err = os.Chmod(unixSocketPath, 0666); err != nil {
-			log.Panicf("Failed to set permission of unix socket %q err: %v\n", unixSocketPath, err)
-		}
-
-		log.Panicln(http.Serve(l, nil))
-	}
-	log.Panicln(http.ListenAndServe(fmt.Sprintf(":%v", port), nil))
 }
 
 func handleTextAdded(gl *glist.GList, text string) {
@@ -177,7 +156,7 @@ func handleTextAdded(gl *glist.GList, text string) {
 		gl.Mutex.Lock()
 		defer gl.Mutex.Unlock()
 		if count == gl.AllMsgCounter {
-			resp := sendList(gl, "sendMessage")
+			resp := sendList(gl, glist.NEWLIST)
 			if resp == nil {
 				return
 			}
@@ -219,13 +198,13 @@ func handleButtonClick(gl *glist.GList, messageID int, text string) {
 		deleteMessage(gl.ChatID, messageID)
 		gl.MessageID = nil
 	} else {
-		sendList(gl, "editMessageText")
+		sendList(gl, glist.EDITLIST)
 	}
 }
 
-func sendList(gl *glist.GList, method string) []byte {
+func sendList(gl *glist.GList, method glist.SendMethod) []byte {
 	url := fmt.Sprintf("https://api.telegram.org/bot%s/%s", apiToken, method)
-	sendMsgReq, err := gl.GenSendListReq()
+	sendMsgReq, err := gl.GenSendListReq(method)
 	if err != nil {
 		log.Println(err)
 		return nil