Adds Commit to stats

Author: denverquane

Dockerfile

@@ -39,7 +39,7 @@ WORKDIR /app
 COPY --from=builder /app /app
 COPY ./locales/ /app/locales
 
-# Port used for
+# Port used for health/liveliness checks
 EXPOSE 8080
 # Port used for application command and control
 EXPOSE 5000

discord/bot.go

@@ -119,7 +119,7 @@ func MakeAndStartBot(version, commit, token, token2, url, emojiGuildID string, n
 
 	dg.UpdateStatusComplex(*status)
 
-	bot.RedisInterface.SetVersion(Version)
+	bot.RedisInterface.SetVersionAndCommit(Version, Commit)
 
 	go StartHealthCheckServer("8080")
 

discord/redis.go

@@ -39,6 +39,10 @@ func versionKey() string {
 	return "automuteus:version"
 }
 
+func commitKey() string {
+	return "automuteus:commit"
+}
+
 func totalGuildsKey(version string) string {
 	return "automuteus:count:guilds:version-" + version
 }
@@ -79,19 +83,29 @@ func (redisInterface *RedisInterface) GetAndIncrementMatchID() int64 {
 	return num
 }
 
-func (redisInterface *RedisInterface) SetVersion(version string) {
+func (redisInterface *RedisInterface) SetVersionAndCommit(version, commit string) {
 	err := redisInterface.client.Set(ctx, versionKey(), version, 0).Err()
 	if err != nil {
 		log.Println(err)
 	}
+
+	err = redisInterface.client.Set(ctx, commitKey(), commit, 0).Err()
+	if err != nil {
+		log.Println(err)
+	}
 }
 
-func (redisInterface *RedisInterface) GetVersion() string {
+func (redisInterface *RedisInterface) GetVersionAndCommit() (string, string) {
 	v, err := redisInterface.client.Get(ctx, versionKey()).Result()
 	if err != nil {
 		log.Println(err)
 	}
-	return v
+
+	c, err := redisInterface.client.Get(ctx, commitKey()).Result()
+	if err != nil {
+		log.Println(err)
+	}
+	return v, c
 }
 
 func (redisInterface *RedisInterface) AddUniqueGuildCounter(guildID, version string) {

discord/responses.go

@@ -116,11 +116,11 @@ func (bot *Bot) statsResponse(sett *storage.GuildSettings) *discordgo.MessageEmb
 		Author:      nil,
 	}
 
-	version := broker.GetVersion(bot.RedisInterface.client)
+	version, commit := broker.GetVersionAndCommit(bot.RedisInterface.client)
 	totalGuilds := broker.GetGuildCounter(bot.RedisInterface.client, version)
 	totalGames := broker.GetActiveGames(bot.RedisInterface.client)
 
-	fields := make([]*discordgo.MessageEmbedField, 3)
+	fields := make([]*discordgo.MessageEmbedField, 4)
 	fields[0] = &discordgo.MessageEmbedField{
 		Name: sett.LocalizeMessage(&i18n.Message{
 			ID:    "responses.statsResponse.Guilds",
@@ -145,6 +145,14 @@ func (bot *Bot) statsResponse(sett *storage.GuildSettings) *discordgo.MessageEmb
 		Value:  version,
 		Inline: true,
 	}
+	fields[3] = &discordgo.MessageEmbedField{
+		Name: sett.LocalizeMessage(&i18n.Message{
+			ID:    "responses.statsResponse.Commit",
+			Other: "Commit",
+		}),
+		Value:  commit,
+		Inline: true,
+	}
 
 	embed.Fields = fields
 	return &embed

go.mod

@@ -6,7 +6,7 @@ go 1.15
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/automuteus/galactus v0.0.1
+	github.com/automuteus/galactus v0.0.3
 	github.com/bsm/redislock v0.7.0
 	github.com/bwmarrin/discordgo v0.22.0
 	github.com/go-redis/redis/v8 v8.3.3

go.sum

@@ -5,6 +5,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/automuteus/galactus v0.0.1 h1:kdMfWIYBdJMZpo7D/BQbU6TzMSPKMngaDMLIS9bJMeU=
 github.com/automuteus/galactus v0.0.1/go.mod h1:fWFnpCRyOs9wSVHvksupPlMPiAEO6CGhbI+uPtrmJcs=
+github.com/automuteus/galactus v0.0.3 h1:9L8GoWhA0xwPjUI2EQh6Vk6a0BZ9XakVMpJ2i/ZbwXk=
+github.com/automuteus/galactus v0.0.3/go.mod h1:fWFnpCRyOs9wSVHvksupPlMPiAEO6CGhbI+uPtrmJcs=
 github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo=
 github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k=
 github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM=

locales/active.en.toml

@@ -101,6 +101,7 @@
 "responses.statsResponse.Guilds" = "Total Guilds"
 "responses.statsResponse.Games" = "Active Games"
 "responses.statsResponse.Version" = "Version"
+"responses.statsResponse.Commit" = "Commit"
 "settings.AllSettings.AdminUserIDs.args" = "<User @ mentions>..."
 "settings.AllSettings.AdminUserIDs.desc" = "Specify which individual users have admin bot permissions"
 "settings.AllSettings.AdminUserIDs.shortDesc" = "Bot Admins"