Merge branch 'release/3.4.1'

cmd/jarvbot/commands.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"math/rand"
+	"os"
 	"regexp"
 	"runtime/debug"
 	"sort"
@@ -45,7 +46,7 @@ func onMessageCreated(ctx context.Context) func(ds *discordgo.Session, mc *disco
 // the command key must be lowercased
 var commands = map[string]command{
 	// public
-	"!version":                   simpleTextResponse("v3.4.0"),
+	"!version":                   simpleTextResponse("v3.4.1"),
 	"!source":                    simpleTextResponse("Source code: https://github.com/j4rv/discord-bot"),
 	"!genshindailycheckin":       answerGenshinDailyCheckIn,
 	"!genshindailycheckinstop":   answerGenshinDailyCheckInStop,
@@ -81,6 +82,7 @@ var commands = map[string]command{
 	"!addglobalcommand":    adminOnly(answerAddGlobalCommand),
 	"!removeglobalcommand": adminOnly(answerRemoveGlobalCommand),
 	"!announce":            adminOnly(answerAnnounce),
+	"!dbbackup":            adminOnly(answerDbBackup),
 	"!reboot":              adminOnly(answerReboot),
 	"!shutdown":            adminOnly(answerShutdown),
 	"!abortshutdown":       adminOnly(answerAbortShutdown),
@@ -313,6 +315,16 @@ func answerAnnounce(ds *discordgo.Session, mc *discordgo.MessageCreate, ctx cont
 	return errors == ""
 }
 
+func answerDbBackup(ds *discordgo.Session, mc *discordgo.MessageCreate, ctx context.Context) bool {
+	reader, err := os.Open(dbFilename)
+	if err != nil {
+		ds.ChannelMessageSend(mc.ChannelID, "Could not open database: "+err.Error())
+		return false
+	}
+	_, err = ds.ChannelFileSend(mc.ChannelID, dbFilename, reader)
+	return err == nil
+}
+
 func answerListCommands(ds *discordgo.Session, mc *discordgo.MessageCreate, ctx context.Context) bool {
 	keys, err := commandDS.allSimpleCommandKeys(mc.GuildID)
 	notifyIfErr("answerListCommands::allSimpleCommandKeys", err, ds)

cmd/jarvbot/modding.go

@@ -43,6 +43,9 @@ func onMessageUpdated(ctx context.Context) func(ds *discordgo.Session, mc *disco
 			if err != nil {
 				return
 			}
+			if mc.BeforeUpdate.Content == mc.Message.Content {
+				return
+			}
 			ds.ChannelMessageSendEmbed(
 				logsChannelID,
 				&discordgo.MessageEmbed{
@@ -165,5 +168,7 @@ func messageUpdatedToString(from, to *discordgo.Message) string {
 	}
 	str += diff(from.Content, "- ")
 	str += diff(to.Content, "+ ")
+	str += fmt.Sprintf("\n[Link to message](https://discord.com/channels/%s/%s/%s)",
+		from.GuildID, from.ChannelID, from.ID)
 	return str
 }