Compare commits

..

No commits in common. "7da090badf13732d6e355e09b71094436bad6ec5" and "0f3db80465f178ae18ba353f858b1cd00b164f52" have entirely different histories.

3 changed files with 19 additions and 51 deletions

View File

@ -15,9 +15,7 @@ This setting should be enabled for the bot in the discord developer panel for it
SERVER_ID = "1050204101826334999"
OUTPUT_CHANNEL_ID = "1250585834726621999"
PREFIX_ENABLED = true
SERVER_ID_ENABLED = false
CHANNEL_ID_ENABLED = true
MESSAGE_LINK_ENABLED = false
ALLOW_DUPLICATES = false
[SERVERS.COIN_REGEXES]
Bitcoin = "[13][a-km-zA-HJ-NP-Z1-9]{25,34}"
Ethereum = "0x[a-fA-F0-9]{40}"
@ -27,10 +25,8 @@ This setting should be enabled for the bot in the discord developer panel for it
[[SERVERS]]
SERVER_ID = "1250885747062345999"
OUTPUT_CHANNEL_ID = "1250585834726621999"
PREFIX_ENABLED = false
SERVER_ID_ENABLED = false
CHANNEL_ID_ENABLED = true
MESSAGE_LINK_ENABLED = false
PREFIX_ENABLED = true
ALLOW_DUPLICATES = false
[SERVERS.COIN_REGEXES]
Ethereum = "0x[a-fA-F0-9]{40}"
Solana = "[1-9A-HJ-NP-Za-km-z]{32,44}"

View File

@ -5,9 +5,6 @@
SERVER_ID = ""
OUTPUT_CHANNEL_ID = ""
PREFIX_ENABLED = true
SERVER_ID_ENABLED = false
CHANNEL_ID_ENABLED = true
MESSAGE_LINK_ENABLED = false
[SERVERS.COIN_REGEXES]
Bitcoin = "[13][a-km-zA-HJ-NP-Z1-9]{25,34}"
Ethereum = "0x[a-fA-F0-9]{40}"
@ -18,9 +15,6 @@
SERVER_ID = ""
OUTPUT_CHANNEL_ID = ""
PREFIX_ENABLED = false
SERVER_ID_ENABLED = false
CHANNEL_ID_ENABLED = true
MESSAGE_LINK_ENABLED = false
[SERVERS.COIN_REGEXES]
Ethereum = "0x[a-fA-F0-9]{40}"
Solana = "[1-9A-HJ-NP-Za-km-z]{32,44}"

44
main.go
View File

@ -5,11 +5,13 @@ import (
"os"
"regexp"
"github.com/BurntSushi/toml"
"github.com/bwmarrin/discordgo"
"git.directme.in/Joren/SmsHook/ringbuffer"
)
var (
Token string
Servers []ServerConfig
@ -27,9 +29,6 @@ type ServerConfig struct {
} `toml:"CHANNEL_BLACKLIST"`
PrefixEnabled bool `toml:"PREFIX_ENABLED"`
AllowDuplicates bool `toml:"ALLOW_DUPLICATES"`
ServerIDEnabled bool `toml:"SERVER_ID_ENABLED"`
ChannelIDEnabled bool `toml:"CHANNEL_ID_ENABLED"`
MessageLinkEnabled bool `toml:"MESSAGE_LINK_ENABLED"`
}
func init() {
@ -111,25 +110,19 @@ func messageCreate(s *discordgo.Session, m *discordgo.MessageCreate) {
return
}
guild, err := s.Guild(m.GuildID)
if err != nil {
fmt.Println("Error getting guild:", err)
return
}
checkMessageContent(s, server, m, guild.Name)
checkEmbeds(s, server, m, guild.Name)
checkMessageContent(s, server, m)
checkEmbeds(s, server, m)
return
}
}
}
func checkMessageContent(s *discordgo.Session, server ServerConfig, m *discordgo.MessageCreate, serverName string) {
func checkMessageContent(s *discordgo.Session, server ServerConfig, m *discordgo.MessageCreate) {
for coin, regex := range CoinRegexes {
match := regex.FindStringSubmatch(m.Content)
if len(match) > 0 {
matchedAddress := match[0]
message := formatMessage(server, coin, m.Author.Username, matchedAddress, serverName, m)
message := formatMessage(server, coin, m.Author.Username, matchedAddress)
if !server.AllowDuplicates && MessageHistory[server.ServerID].ContainsItem(message) {
return
@ -141,14 +134,14 @@ func checkMessageContent(s *discordgo.Session, server ServerConfig, m *discordgo
}
}
func checkEmbeds(s *discordgo.Session, server ServerConfig, m *discordgo.MessageCreate, serverName string) {
func checkEmbeds(s *discordgo.Session, server ServerConfig, m *discordgo.MessageCreate) {
for _, embed := range m.Message.Embeds {
if embed.Type == "rich" && embed.Description != "" {
for coin, regex := range CoinRegexes {
match := regex.FindStringSubmatch(embed.Description)
if len(match) > 0 {
matchedAddress := match[0]
message := formatMessage(server, coin, m.Author.Username, matchedAddress, serverName, m)
message := formatMessage(server, coin, m.Author.Username, matchedAddress)
if !server.AllowDuplicates && MessageHistory[server.ServerID].ContainsItem(message) {
return
@ -162,26 +155,11 @@ func checkEmbeds(s *discordgo.Session, server ServerConfig, m *discordgo.Message
}
}
func formatMessage(server ServerConfig, coin, username, address, serverName string, m *discordgo.MessageCreate) string {
message := address
func formatMessage(server ServerConfig, coin, username, address string) string {
if server.PrefixEnabled {
message = fmt.Sprintf("%s: %s", coin, address)
return fmt.Sprintf("%s: %s", coin, address)
}
if server.ServerIDEnabled {
message = fmt.Sprintf("%s (Server: %s)", message, serverName)
}
if server.ChannelIDEnabled {
message = fmt.Sprintf("%s (From: <#%s>)", message, m.ChannelID)
}
if server.MessageLinkEnabled {
message = fmt.Sprintf("%s ([Link](<https://discord.com/channels/%s/%s/%s>))", message, m.GuildID, m.ChannelID, m.ID)
}
return message
return address
}
func isChannelBlacklisted(serverID, channelID string) bool {