Merge branch 'release/3.6.1'

j4rv · Apr 16, 2024 · 5fbb40f · 5fbb40f
2 parents d138b8f + 5f08d8e
commit 5fbb40f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cmd/jarvbot/commands.go b/cmd/jarvbot/commands.go
@@ -20,6 +20,7 @@ import (
 const roleEveryone = "@everyone"
 const globalGuildID = ""
 
+var ogNonRootTwitterLinkRegex = regexp.MustCompile(`\b(?:https?://)?(?:www\.)?(?:twitter|x)\.com/\S+\b`)
 var ogTwitterLinkRegex = regexp.MustCompile(`\b(?:https?://)?(?:www\.)?(?:twitter|x)\.com\b`)
 var commandPrefixRegex = regexp.MustCompile(`^!\w+\s*`)
 var commandWithTwoArguments = regexp.MustCompile(`^!\w+\s*(\(.{1,36}\))\s*(\(.{1,36}\))`)
@@ -46,7 +47,7 @@ func onMessageCreated(ctx context.Context) func(ds *discordgo.Session, mc *disco
 		}
 
 		// Twitter links replacement
-		if ogTwitterLinkRegex.MatchString(mc.Content) {
+		if ogNonRootTwitterLinkRegex.MatchString(mc.Content) {
 			processMessageWithTwitterLinks(ds, mc, ctx)
 			return
 		}
@@ -56,7 +57,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.6.0"),
+	"!version":                   simpleTextResponse("v3.6.1"),
 	"!source":                    simpleTextResponse("Source code: https://github.com/j4rv/discord-bot"),
 	"!genshindailycheckin":       answerGenshinDailyCheckIn,
 	"!genshindailycheckinstop":   answerGenshinDailyCheckInStop,
@@ -263,7 +264,10 @@ func processMessageWithTwitterLinks(ds *discordgo.Session, mc *discordgo.Message
 
 	messageContent := ogTwitterLinkRegex.ReplaceAllString(mc.Content, "https://fxtwitter.com")
 	messageContent = fmt.Sprintf("%s:\n%s", mc.Author.Mention(), messageContent)
-	_, err := ds.ChannelMessageSend(mc.ChannelID, messageContent)
+	_, err := ds.ChannelMessageSendComplex(mc.ChannelID, &discordgo.MessageSend{
+		Content:         messageContent,
+		AllowedMentions: &discordgo.MessageAllowedMentions{},
+	})
 	if err != nil {
 		notifyIfErr("processMessageWithTwitterLinks::ds.ChannelMessageSend", err, ds)
 		return