From 8b9edd532fbcc975fa0ad09663f0995f4da72bbd Mon Sep 17 00:00:00 2001 From: Chatter Chats <57570001+chatterchats@users.noreply.github.com> Date: Thu, 4 Apr 2024 01:48:32 -0400 Subject: [PATCH 1/4] Update generateRequest to include User-Agent --- pkg/shared/helldivers/lib/client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/shared/helldivers/lib/client.go b/pkg/shared/helldivers/lib/client.go index 35fb26c..e0f4d7a 100644 --- a/pkg/shared/helldivers/lib/client.go +++ b/pkg/shared/helldivers/lib/client.go @@ -47,6 +47,7 @@ func (c *Client) generateRequest(method string, endpoint string, data []byte) (* return nil, err } req.Header.Set("Accept-Language", "en-US") + req.Header.Set("User-Agent", "Helldivers II Tools") return req, err } From ebe36c4e5dd169356df917af3a6986bce1f08ce1 Mon Sep 17 00:00:00 2001 From: Millefeuille42 Date: Thu, 4 Apr 2024 09:52:50 +0200 Subject: [PATCH 2/4] feat: add more details to user agent via env --- docker-compose.yml | 3 +++ pkg/shared/helldivers/lib/client.go | 8 +++++++- sample.env | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a5ceee9..cf09a13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: depends_on: - redis environment: + - HDII__GENERIC__USER_AGENT=${HDII__GENERIC__USER_AGENT-docker}-api - HDII__API__BIND_ADDRESS=0.0.0.0:3000 - HDII__API__REDIS_DB=${HDII__API__REDIS_DB-0} - HDII__API__REDIS_HOST=${HDII__API__REDIS_HOST-redis} @@ -31,6 +32,7 @@ services: depends_on: - api environment: + - HDII__GENERIC__USER_AGENT=${HDII__GENERIC__USER_AGENT-docker}-bot - HDII__API__REDIS_DB=${HDII__API__REDIS_DB-0} - HDII__API__REDIS_HOST=${HDII__API__REDIS_HOST-redis} - HDII__API__REDIS_PORT=${HDII__API__REDIS_PORT-6379} @@ -50,6 +52,7 @@ services: - api - redis environment: + - HDII__GENERIC__USER_AGENT=${HDII__GENERIC__USER_AGENT-docker}-updater - HDII__API__REDIS_DB=${HDII__API__REDIS_DB-0} - HDII__API__REDIS_HOST=${HDII__API__REDIS_HOST-redis} - HDII__API__REDIS_PORT=${HDII__API__REDIS_PORT-6379} diff --git a/pkg/shared/helldivers/lib/client.go b/pkg/shared/helldivers/lib/client.go index e0f4d7a..ab930a1 100644 --- a/pkg/shared/helldivers/lib/client.go +++ b/pkg/shared/helldivers/lib/client.go @@ -2,10 +2,12 @@ package lib import ( "bytes" + "fmt" "io" "net/http" "net/http/cookiejar" "net/url" + "os" ) type Response struct { @@ -47,7 +49,11 @@ func (c *Client) generateRequest(method string, endpoint string, data []byte) (* return nil, err } req.Header.Set("Accept-Language", "en-US") - req.Header.Set("User-Agent", "Helldivers II Tools") + userAgent := "Helldivers II Tools" + if os.Getenv("HDII__GENERIC__USER_AGENT") != "" { + userAgent = fmt.Sprintf("%s - %s", userAgent, os.Getenv("HDII__GENERIC__USER_AGENT")) + } + req.Header.Set("User-Agent", userAgent) return req, err } diff --git a/sample.env b/sample.env index 03c81a3..c4284db 100644 --- a/sample.env +++ b/sample.env @@ -1,3 +1,6 @@ +# Generic elements +HDII__GENERIC__USER_AGENT= + # Discord bot token HDII__BOT__TOKEN=token From 6c6318348ddb17ecb1e7566c061a683fec9f4428 Mon Sep 17 00:00:00 2001 From: Millefeuille Date: Thu, 4 Apr 2024 10:56:21 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d1dfe21..37397f1 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Welcome, Helldiver! You're about to deploy the Helldivers II Discord Bot, your t The Helldivers II Discord Bot is accessible at [this url](https://discord.com/oauth2/authorize?client_id=1219964573231091713&permissions=277025705024&scope=bot) for immediate deployment. Alternatively, it can be self-deployed using the provided resources. +[Join the official server!](https://discord.gg/5DawaMJh) + ## Mission Objectives Your mission, should you choose to accept it, involves the following objectives: From 77ae8306fd45ae59d11bc9bb4c5c749da4b01cc4 Mon Sep 17 00:00:00 2001 From: Millefeuille42 Date: Thu, 4 Apr 2024 10:58:02 +0200 Subject: [PATCH 4/4] misc: added develop PR to action triggers --- .github/workflows/docker-publish-api.yml | 2 +- .github/workflows/docker-publish-bot.yml | 2 +- .github/workflows/docker-publish-updater.yml | 2 +- .github/workflows/go.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-publish-api.yml b/.github/workflows/docker-publish-api.yml index 3f5537b..e2927d2 100644 --- a/.github/workflows/docker-publish-api.yml +++ b/.github/workflows/docker-publish-api.yml @@ -5,7 +5,7 @@ on: branches: [ "master" ] tags: [ 'v*.*.*' ] pull_request: - branches: [ "master" ] + branches: [ "master", "develop" ] env: REGISTRY: ghcr.io diff --git a/.github/workflows/docker-publish-bot.yml b/.github/workflows/docker-publish-bot.yml index de84402..c6886d6 100644 --- a/.github/workflows/docker-publish-bot.yml +++ b/.github/workflows/docker-publish-bot.yml @@ -5,7 +5,7 @@ on: branches: [ "master" ] tags: [ 'v*.*.*' ] pull_request: - branches: [ "master" ] + branches: [ "master", "develop" ] env: REGISTRY: ghcr.io diff --git a/.github/workflows/docker-publish-updater.yml b/.github/workflows/docker-publish-updater.yml index 051ce7e..72c435e 100644 --- a/.github/workflows/docker-publish-updater.yml +++ b/.github/workflows/docker-publish-updater.yml @@ -5,7 +5,7 @@ on: branches: [ "master" ] tags: [ 'v*.*.*' ] pull_request: - branches: [ "master" ] + branches: [ "master", "develop" ] env: REGISTRY: ghcr.io diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index bd4c034..871b0dc 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -4,7 +4,7 @@ on: push: branches: [ "master" ] pull_request: - branches: [ "master" ] + branches: [ "master", "develop" ] jobs: build-api: