Fix bug related to www

internal/exts/messages/message_events.go

@@ -18,7 +18,7 @@ func OnMessage(s *discordgo.Session, message *discordgo.MessageCreate) {
 		return
 	}
 	content := message.Content
-	amazonRegexString := `(http|https):\/\/((?:[\w-_\.]+)amazon(?:\.[\w\-_]+)+)([\w\/\-\.,@?^=%&~\+#]*[\w\-\@?^=%&/~\+#])?`
+	amazonRegexString := `(http|https):\/\/((?:[\w-_\.]*)amazon(?:\.[\w\-_]+)+)([\w\/\-\.,@?^=%&~\+#]*[\w\-\@?^=%&/~\+#])?`
 	amazonRegex := regexp.MustCompile(amazonRegexString)
 	urls := amazonRegex.FindAllString(message.Content, -1)
 	if len(urls) == 0 {
@@ -36,9 +36,15 @@ func OnMessage(s *discordgo.Session, message *discordgo.MessageCreate) {
 		return
 	}
 	defer s.WebhookDelete(webhook.ID)
+	var name string
+	if message.Member != nil && message.Member.Nick != "" {
+		name = message.Member.Nick
+	} else {
+		name = message.Author.Username
+	}
 	params := &discordgo.WebhookParams{
 		Content:   content,
-		Username:  message.Author.Username,
+		Username:  name,
 		AvatarURL: message.Author.AvatarURL(""),
 	}
 	_, err = s.WebhookExecute(webhook.ID, webhook.Token, true, params)