Merge pull request #12 from Antosik/feat/update-november

Feat: Little refactor

.github/workflows/lint.yml

@@ -26,4 +26,4 @@ jobs:
       - name: Lint with golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.58
+          version: v1.61

.golangci.yml

@@ -9,13 +9,30 @@ outputs:
   format: colored-line-number
 
 linters:
-  enable:
-    - revive
-    - gosec
-    - lll
-    - wsl
+  presets:
+    - bugs
+    - comment
+    - complexity
+    - error
+    - format
+    - import
+    - metalinter
+    - module
+    - performance
+    - style
+    - test
+    - unused
+  disable:
+   - depguard # tbd
+   - exhaustruct # tbd
+   - wrapcheck # tbd
+   - tagliatelle # json case differs from output to output
+   - gochecknoinits # we need init for lambda
+   - gochecknoglobals # we need globals for lambda
 
 linters-settings:
   gosec:
     excludes:
       - G107
+  funlen:
+    lines: 80

Makefile

@@ -87,8 +87,8 @@ build-LeagueOfLegendsNewsChecker:
 	mv ./lolnews $(ARTIFACTS_DIR)/bootstrap
 
 build-LeagueOfLegendsEsportsChecker:
-	GOARCH=amd64 GOOS=linux go build -trimpath -o ./lolesports lol/esports/main.go lol/esports/utils.go
-	mv ./lolesports $(ARTIFACTS_DIR)/lolesports
+	GOARCH=arm64 GOOS=linux go build -trimpath -o ./lolesports lol/esports/main.go lol/esports/utils.go
+	mv ./lolesports $(ARTIFACTS_DIR)/bootstrap
 #endregion Build: League of Legends
 
 #region Build: VALORANT
@@ -101,8 +101,8 @@ build-VALORANTNewsChecker:
 	mv ./valnews $(ARTIFACTS_DIR)/bootstrap
 
 build-VALORANTEsportsChecker:
-	GOARCH=amd64 GOOS=linux go build -trimpath -o ./valesports val/esports/main.go val/esports/utils.go
-	mv ./valesports $(ARTIFACTS_DIR)/valesports
+	GOARCH=arm64 GOOS=linux go build -trimpath -o ./valesports val/esports/main.go val/esports/utils.go
+	mv ./valesports $(ARTIFACTS_DIR)/bootstrap
 #endregion Build: VALORANT
 
 #region Build: Legends of Runeterra
@@ -129,10 +129,6 @@ build-WildRiftStatusChecker:
 build-WildRiftNewsChecker:
 	GOARCH=arm64 GOOS=linux go build -trimpath -o ./wrnews wr/news/main.go wr/news/utils.go
 	mv ./wrnews $(ARTIFACTS_DIR)/bootstrap
-
-build-WildRiftEsportsChecker:
-	GOARCH=amd64 GOOS=linux go build -trimpath -o ./wresports wr/esports/main.go wr/esports/utils.go
-	mv ./wresports $(ARTIFACTS_DIR)/wresports
 #endregion Build: WildRift
 
 #endregion Build: RiotGames

README.md

@@ -28,11 +28,10 @@ This service generates an Atom, JSONFeed, RSS and raw JSON data from various off
 -   VALORANT
     -   [News](docs/en/valorant/news.md)
     -   [Esports](docs/en/valorant/esports.md)
-    -   [Server status](docs/en/league-of-legends/server-status.md)
+    -   [Server status](docs/en/valorant/server-status.md)
 -   Wild Rift
     -   [News](docs/en/wild-rift/news.md)
-    -   [Esports](docs/en/league-of-legends/esports.md)
-    -   [Server status](docs/en/league-of-legends/server-status.md)
+    -   [Server status](docs/en/wild-rift/server-status.md)
 
 ## Attribution
 This service isn't developed by Riot Games and doesn't reflect the views or opinions of Riot Games or anyone officially involved in producing or managing League of Legends, Legends of Runeterra, Teamfight Tactics, VALORANT, or Wild Rift. League of Legends, Legends of Runeterra, Teamfight Tactics, VALORANT, Wild Rift and Riot Games are trademarks or registered trademarks of Riot Games, Inc. League of Legends, Legends of Runeterra, Teamfight Tactics, VALORANT, Wild Rift (c) Riot Games, Inc.

docs/en/README.md

@@ -18,11 +18,10 @@ To get links to Atom/JSONFeed/RSS files and raw data files (.json) follow this g
 -   VALORANT
     -   [News](valorant/news.md)
     -   [Esports](valorant/esports.md)
-    -   [Server status](league-of-legends/server-status.md)
+    -   [Server status](valorant/server-status.md)
 -   Wild Rift
     -   [News](wild-rift/news.md)
-    -   [Esports](league-of-legends/esports.md)
-    -   [Server status](league-of-legends/server-status.md)
+    -   [Server status](wild-rift/server-status.md)
 
 ## Use links
 - Use your favourite Atom/RSS/JSONFeed reader, e.g. [Feedly](https://feedly.com), [NewsBlur](https://www.newsblur.com/), [Inoreader](https://www.inoreader.com/);

go.mod

@@ -1,45 +1,36 @@
+module github.com/Antosik/rito-news-feeds
+
+go 1.23
+
+toolchain go1.23.2
+
 require (
-	github.com/Antosik/rito-news v0.0.0-20240724023344-14f1f3a6bb77
+	github.com/Antosik/rito-news v0.0.0-20241107134709-fcecf71538fb
 	github.com/aws/aws-lambda-go v1.47.0
-	github.com/aws/aws-sdk-go-v2 v1.27.0
-	github.com/aws/aws-sdk-go-v2/config v1.27.16
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.21
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.54.3
+	github.com/aws/aws-sdk-go-v2 v1.32.4
+	github.com/aws/aws-sdk-go-v2/config v1.28.2
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.36
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3
 )
 
 require (
-	github.com/PuerkitoBio/goquery v1.9.2 // indirect
+	github.com/PuerkitoBio/goquery v1.10.0 // indirect
 	github.com/andybalholm/cascadia v1.3.2 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.16 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 // indirect
-	github.com/aws/smithy-go v1.20.2 // indirect
-	github.com/go-rod/rod v0.116.0 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.43 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 // indirect
+	github.com/aws/smithy-go v1.22.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/ysmood/fetchup v0.2.4 // indirect
-	github.com/ysmood/goob v0.4.0 // indirect
-	github.com/ysmood/got v0.39.5 // indirect
-	github.com/ysmood/gson v0.7.3 // indirect
-	github.com/ysmood/leakless v0.8.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
 )
-
-replace gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.8
-
-module github.com/Antosik/rito-news-feeds
-
-go 1.21
-
-toolchain go1.22.3