fixes for v1.0.2-alpha

Millefeuille42 · Apr 5, 2024 · 28b1626 · 28b1626
2 parents dfde0eb + 28518fc
commit 28b1626
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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/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},
  })
 }
diff --git 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
@@ -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
@@ -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)
 }