Compare commits

..

No commits in common. "2df3f1c0b3d829a97c080a9aeb9ae8d12117ae2f" and "23a3ff1da252023b4e0ae3c48f25833f48ae6eb3" have entirely different histories.

2 changed files with 4 additions and 9 deletions

View File

@ -4,7 +4,6 @@
[[SERVERS]] [[SERVERS]]
SERVER_ID = "" SERVER_ID = ""
OUTPUT_CHANNEL_ID = "" OUTPUT_CHANNEL_ID = ""
ALLOW_DUPLICATES = false
PREFIX_ENABLED = true PREFIX_ENABLED = true
SERVER_ID_ENABLED = false SERVER_ID_ENABLED = false
CHANNEL_ID_ENABLED = true CHANNEL_ID_ENABLED = true
@ -19,7 +18,6 @@
SERVER_ID = "" SERVER_ID = ""
OUTPUT_CHANNEL_ID = "" OUTPUT_CHANNEL_ID = ""
PREFIX_ENABLED = false PREFIX_ENABLED = false
ALLOW_DUPLICATES = false
SERVER_ID_ENABLED = false SERVER_ID_ENABLED = false
CHANNEL_ID_ENABLED = true CHANNEL_ID_ENABLED = true
MESSAGE_LINK_ENABLED = false MESSAGE_LINK_ENABLED = false

11
main.go
View File

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"os" "os"
"regexp" "regexp"
"strings"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
@ -130,15 +129,14 @@ func checkMessageContent(s *discordgo.Session, server ServerConfig, m *discordgo
match := regex.FindStringSubmatch(m.Content) match := regex.FindStringSubmatch(m.Content)
if len(match) > 0 { if len(match) > 0 {
matchedAddress := match[0] matchedAddress := match[0]
matchedAddress = strings.TrimSpace(matchedAddress)
message := formatMessage(server, coin, m.Author.Username, matchedAddress, serverName, m) message := formatMessage(server, coin, m.Author.Username, matchedAddress, serverName, m)
if !server.AllowDuplicates && MessageHistory[server.ServerID].ContainsItem(matchedAddress) { if !server.AllowDuplicates && MessageHistory[server.ServerID].ContainsItem(message) {
return return
} }
s.ChannelMessageSend(server.OutputChannelID, message) s.ChannelMessageSend(server.OutputChannelID, message)
MessageHistory[server.ServerID].Add(matchedAddress) MessageHistory[server.ServerID].Add(message)
} }
} }
} }
@ -150,15 +148,14 @@ func checkEmbeds(s *discordgo.Session, server ServerConfig, m *discordgo.Message
match := regex.FindStringSubmatch(embed.Description) match := regex.FindStringSubmatch(embed.Description)
if len(match) > 0 { if len(match) > 0 {
matchedAddress := match[0] matchedAddress := match[0]
matchedAddress = strings.TrimSpace(matchedAddress)
message := formatMessage(server, coin, m.Author.Username, matchedAddress, serverName, m) message := formatMessage(server, coin, m.Author.Username, matchedAddress, serverName, m)
if !server.AllowDuplicates && MessageHistory[server.ServerID].ContainsItem(matchedAddress) { if !server.AllowDuplicates && MessageHistory[server.ServerID].ContainsItem(message) {
return return
} }
s.ChannelMessageSend(server.OutputChannelID, message) s.ChannelMessageSend(server.OutputChannelID, message)
MessageHistory[server.ServerID].Add(matchedAddress) MessageHistory[server.ServerID].Add(message)
} }
} }
} }