✨ upgrade and fix tests

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Setup Go for use with actions
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - uses: actions/checkout@v2
 
@@ -19,4 +19,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.50.0
+          version: v1.54.2

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

.golangci.yml

@@ -36,6 +36,7 @@ linters:
   disable:
     - gci # conflicts with gofumpt
     - goimports # conflicts with gofumpt
+    - depguard
 
 run:
   timeout: 5m

Dockerfile

@@ -1,5 +1,5 @@
 # Compile app binary
-FROM golang:1.19.2-alpine3.16 as build-env
+FROM golang:1.21.2 as build-env
 
 WORKDIR /build
 

go.mod

@@ -1,3 +1,3 @@
 module mynews
 
-go 1.19
+go 1.21

internal/pkg/broadcast/telegram.go

@@ -70,7 +70,7 @@ func (t Telegram) Send(message Story) error {
 		),
 		ReplyMarkup: replyMarkup{
 			InlineKeyboard: [][]inlineKeyboard{
-				{{Text: "Read", URL: message.URL}},
+				{{Text: "Read", URL: message.URL, SwitchInlineQuery: ""}},
 			},
 		},
 	}

internal/pkg/config/file.go

@@ -153,10 +153,14 @@ func createSampleFile(filePath string) error {
 			IgnoreStoriesBefore: time.Date(2020, 4, 20, 0, 0, 0, 0, time.UTC).Format(time.RFC3339),
 			MustIncludeAnyOf:    []string{"linux", "golang", "musk"},
 			MustExcludeAnyOf:    []string{"windows", "trump", "apple"},
+			StatusPage:          false,
 		},
 		{
 			URL:                 "https://hnrss.org/newest.atom",
 			IgnoreStoriesBefore: time.Hour.String(),
+			MustIncludeAnyOf:    nil,
+			MustExcludeAnyOf:    nil,
+			StatusPage:          false,
 		},
 	}
 
@@ -168,8 +172,10 @@ func createSampleFile(filePath string) error {
 		StorageFilePath:                "",
 		Elements: []fileStructureElement{
 			{
-				BroadcastType: "stdout",
-				Sources:       sources,
+				BroadcastType:       "stdout",
+				Sources:             sources,
+				TelegramBotAPIToken: "",
+				TelegramChatID:      "",
 			},
 		},
 		LegacyBroadcastType:       "",

internal/pkg/logger/logger.go

@@ -39,7 +39,6 @@ func (l Log) Fatal(msg string, err error) {
 	l.print(Error, msg, err)
 }
 
-//nolint:forbidigo // allow in library
 func (l Log) print(logLevel Level, msg ...interface{}) {
 	if logLevel < l.logLevel {
 		return

internal/pkg/storage/storage_test.go

@@ -14,10 +14,10 @@ func TestStorage(t *testing.T) {
 
 	store := storage.New()
 
-	rand.Seed(time.Now().Unix())
+	rGen := rand.New(rand.NewSource(time.Now().Unix()))
 
 	for i := 0; i < 1000; i++ {
-		randomKey := fmt.Sprint(rand.Int())
+		randomKey := fmt.Sprint(rGen.Int())
 
 		exists, err := store.KeyExists("", randomKey)
 		if err != nil {
@@ -50,10 +50,10 @@ func TestStorageCleanup(t *testing.T) {
 
 	store := storage.New()
 
-	rand.Seed(time.Now().Unix())
+	rGen := rand.New(rand.NewSource(time.Now().Unix()))
 
 	for i := 0; i < 1000; i++ {
-		randomKey := fmt.Sprint(rand.Int())
+		randomKey := fmt.Sprint(rGen.Int())
 
 		cleanupBefore := time.Now()
 

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: mynews
-version: '1.6.0'
+version: '1.7.0'
 summary: Personalized news feed parser & broadcast
 description: Easily specify your RSS/Atom sources and broadcast preferences to get personalized news feed.
 base: core22