Merge branch 'main' of ssh://git.directme.in:2222/Joren/SolMonitor

README.md

@@ -37,3 +37,31 @@ This setting should be enabled for the bot in the discord developer panel for it
   [SERVERS.CHANNEL_BLACKLIST]
     CHANNELS = []
 ```
+
+### Explaination
+
+```toml
+[DISCORD]
+  BOT_TOKEN = ""
+
+[[SERVERS]]
+  # ID of the server in which all the channels should be monitored
+  SERVER_ID = "1050204101826334999"
+  # Channel where everything should be send to
+  OUTPUT_CHANNEL_ID = "1250585834726621999"
+  # Wether to show the coin prefix or not
+  PREFIX_ENABLED = true
+  # Display name of server a message has been send in
+  SERVER_ID_ENABLED = false
+  # Display clickable channel object of server a message has been send in
+  CHANNEL_ID_ENABLED = true
+  # Provides a link to the message where the regex has been matched
+  MESSAGE_LINK_ENABLED = false
+  [SERVERS.COIN_REGEXES]
+    # Prefix = Regex pair of the coin(s) to be matched; can theoretically be used for other stuff
+    Bitcoin = "[13][a-km-zA-HJ-NP-Z1-9]{25,34}"
+    Ethereum = "0x[a-fA-F0-9]{40}"
+  [SERVERS.CHANNEL_BLACKLIST]
+    # IDs of the channels that should NOT be monitored
+    CHANNELS = ["1250537334550827078"]
+```

config.toml.example

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

main.go

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