From 41f332b0c48547745dc6e9f25befd7fb1e4fa1df Mon Sep 17 00:00:00 2001 From: Millefeuille42 Date: Thu, 4 Apr 2024 13:25:20 +0200 Subject: [PATCH 1/3] fix: remove markup from bot status --- cmd/bot/main.go | 2 +- pkg/bot/embeds/feed.go | 4 ++-- pkg/shared/utils/stripMarkup.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/bot/main.go b/cmd/bot/main.go index 667aea1..d044b2d 100644 --- a/cmd/bot/main.go +++ b/cmd/bot/main.go @@ -20,7 +20,7 @@ import ( ) func setBotStatus(status string) error { - return globals.Bot.UpdateListeningStatus(status) + return globals.Bot.UpdateListeningStatus(utils.StripMarkup(status, "")) } func setUpBot() *discordgo.Session { diff --git a/pkg/bot/embeds/feed.go b/pkg/bot/embeds/feed.go index 48f9bdc..0a498dd 100644 --- a/pkg/bot/embeds/feed.go +++ b/pkg/bot/embeds/feed.go @@ -24,7 +24,7 @@ func BuildFeedEmbed(news lib.NewsMessage, color int) *discordgo.MessageEmbed { return &discordgo.MessageEmbed{ Type: "rich", Color: color, - Title: "Incoming message: " + utils.StripMarkup(title), - Description: utils.StripMarkup(desc), + Title: "Incoming message: " + utils.StripMarkup(title, "**"), + Description: utils.StripMarkup(desc, "**"), } } diff --git a/pkg/shared/utils/stripMarkup.go b/pkg/shared/utils/stripMarkup.go index 91704b7..94b8f63 100644 --- a/pkg/shared/utils/stripMarkup.go +++ b/pkg/shared/utils/stripMarkup.go @@ -4,6 +4,6 @@ import "regexp" var re = regexp.MustCompile("<[^>]*>") -func StripMarkup(text string) string { - return re.ReplaceAllString(text, "**") +func StripMarkup(text, replacement string) string { + return re.ReplaceAllString(text, replacement) } From 5a634fbdc431ab8350cf5ce81c1930ca54b5ef0a Mon Sep 17 00:00:00 2001 From: Millefeuille42 Date: Fri, 5 Apr 2024 10:05:39 +0200 Subject: [PATCH 2/3] fix: corrected planet message --- cmd/bot/events.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/bot/events.go b/cmd/bot/events.go index 976dd10..a1e2dc6 100644 --- a/cmd/bot/events.go +++ b/cmd/bot/events.go @@ -89,7 +89,7 @@ func handlePlanetLiberated(event []byte) error { embed.Title = fmt.Sprintf("✅ %s liberated", embed.Title) return streamComplex(&discordgo.MessageSend{ Components: components.BuildPlanetComponent(planet), - Embeds: []*discordgo.MessageEmbed{embeds.BuildPlanetEmbed(planet)}, + Embeds: []*discordgo.MessageEmbed{embed}, }) } @@ -104,6 +104,6 @@ func handlePlanetLost(event []byte) error { embed.Title = fmt.Sprintf("❌ %s lost to the %s", embed.Title, embeds.NameMap[planet.Owner]) return streamComplex(&discordgo.MessageSend{ Components: components.BuildPlanetComponent(planet), - Embeds: []*discordgo.MessageEmbed{embeds.BuildPlanetEmbed(planet)}, + Embeds: []*discordgo.MessageEmbed{embed}, }) } From 28518fc5eb71e5909f80730d81a7aff30fe74de8 Mon Sep 17 00:00:00 2001 From: Millefeuille42 Date: Fri, 5 Apr 2024 10:11:03 +0200 Subject: [PATCH 3/3] misc: add build for arm --- .github/workflows/docker-publish-api.yml | 1 + .github/workflows/docker-publish-bot.yml | 1 + .github/workflows/docker-publish-updater.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/docker-publish-api.yml b/.github/workflows/docker-publish-api.yml index e2927d2..8a20b49 100644 --- a/.github/workflows/docker-publish-api.yml +++ b/.github/workflows/docker-publish-api.yml @@ -57,6 +57,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max + platforms: linux/amd64,linux/arm64 - name: Sign the published Docker image if: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/docker-publish-bot.yml b/.github/workflows/docker-publish-bot.yml index c6886d6..9c0deb1 100644 --- a/.github/workflows/docker-publish-bot.yml +++ b/.github/workflows/docker-publish-bot.yml @@ -57,6 +57,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max + platforms: linux/amd64,linux/arm64 - name: Sign the published Docker image if: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/docker-publish-updater.yml b/.github/workflows/docker-publish-updater.yml index 72c435e..0e79d2f 100644 --- a/.github/workflows/docker-publish-updater.yml +++ b/.github/workflows/docker-publish-updater.yml @@ -57,6 +57,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max + platforms: linux/amd64,linux/arm64 - name: Sign the published Docker image if: ${{ github.event_name != 'pull_request' }}