Add method to move links to link channel

cmd/prepbot/main.go

@@ -39,7 +39,7 @@ func main() {
 		CheckPermissions: false,
 	}
 
-	dg.AddHandler(messages.OnMessage)
+	dg.AddHandler(messages.CleanAmazonURLs)
 
 	err = dg.Open()
 	if err != nil {

internal/exts/messages/message_events.go

@@ -8,42 +8,72 @@ import (
 	"github.com/bwmarrin/discordgo"
 )
 
-func OnMessage(s *discordgo.Session, message *discordgo.MessageCreate) {
+func CleanAmazonURLs(s *discordgo.Session, message *discordgo.MessageCreate) {
 	defer func() {
 		if r := recover(); r != nil {
-			log.Println("Recovered from panic in OnMessage")
+			log.Println("Recovered from panic in CleanAmazonURLs")
 		}
 	}()
 	if message.Author.Bot {
 		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 {
+	if len(urls) != 0 {
-		return
+
-	}
+		for _, url := range urls {
-	for _, url := range urls {
+			if strings.Contains(url, "ref=") || strings.Contains(url, "?") {
-		if strings.Contains(url, "ref=") || strings.Contains(url, "?") {
+				parts := strings.Split(url, "/")
-			parts := strings.Split(url, "/")
+				new := strings.Join(parts[:len(parts)-1], "/")
-			new := strings.Join(parts[:len(parts)-1], "/")
+				if strings.Contains(new, "ref=") {
-			content = strings.ReplaceAll(content, url, new)
+					parts = strings.Split(new, "ref=")
+					new = parts[0]
+				}
+				content = strings.ReplaceAll(content, url, new)
+			}
+		}
+		_, err := sendWebhook(s, message, message.ChannelID, content)
+		if err == nil {
+			s.ChannelMessageDelete(message.ChannelID, message.ID)
 		}
 	}
-	webhook, err := s.WebhookCreate(message.ChannelID, message.ID, "")
+	message.Content = content
+	moveNewsLinks(s, message)
+}
+
+func moveNewsLinks(s *discordgo.Session, message *discordgo.MessageCreate) {
+	linkChannel := "784855106239332352"
+	chatChannel := "777679317878177804"
+	if message.ChannelID == chatChannel {
+		_, err := sendWebhook(s, message, linkChannel, message.Content)
+		if err != nil {
+			log.Println(err)
+		}
+	}
+}
+
+func sendWebhook(s *discordgo.Session, message *discordgo.MessageCreate, channelID, content string) (string, error) {
+	webhook, err := s.WebhookCreate(channelID, message.ID, "")
 	if err != nil {
-		return
+		return "", err
 	}
 	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)
+	w, err := s.WebhookExecute(webhook.ID, webhook.Token, true, params)
 	if err != nil {
-		return
+		return "", err
 	}
-	s.ChannelMessageDelete(message.ChannelID, message.ID)
+	return w.ID, nil
 }