Twinki 2 лет назад
Родитель
Сommit
c4c3abab0a
3 измененных файлов с 11 добавлено и 3 удалено
  1. 7 0
      discord.go
  2. 2 3
      go.mod
  3. 2 0
      go.sum

+ 7 - 0
discord.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/AvraamMavridis/randomcolor"
+	"github.com/aidarkhanov/nanoid/v2"
 	"github.com/bwmarrin/discordgo"
 	"github.com/fatih/color"
 	"github.com/hako/durafmt"
@@ -161,6 +162,11 @@ func filenameKeyReplacement(channelConfig configurationChannel, download downloa
 			}
 		}
 
+		nanoUid, err := nanoid.New()
+		if err != nil {
+			log.Println(logPrefixDebug, color.HiCyanString("Error when creating a nanoid %s", err))
+		}
+
 		keys := [][]string{
 			{"{{date}}", messageTime.Format(filenameDateFormat)},
 			{"{{file}}", download.Filename},
@@ -170,6 +176,7 @@ func filenameKeyReplacement(channelConfig configurationChannel, download downloa
 			{"{{channelID}}", download.Message.ChannelID},
 			{"{{serverID}}", download.Message.GuildID},
 			{"{{message}}", clearPath(download.Message.Content)},
+			{"{{nanoUid}}", nanoUid},
 		}
 		for _, key := range keys {
 			if strings.Contains(ret, key[0]) {

+ 2 - 3
go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/Jeffail/gabs v1.4.0
 	github.com/Necroforger/dgrouter v0.0.0-20200517224846-e66453b957c1
 	github.com/PuerkitoBio/goquery v1.6.1
+	github.com/aidarkhanov/nanoid/v2 v2.0.5
 	github.com/azr/backoff v0.0.0-20160115115103-53511d3c7330 // indirect
 	github.com/bwmarrin/discordgo v0.22.0
 	github.com/dustin/go-jsonpointer v0.0.0-20160814072949-ba0abeacc3dc // indirect
@@ -30,6 +31,4 @@ require (
 	mvdan.cc/xurls/v2 v2.2.0
 )
 
-replace (
-    github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.1
-)
+replace github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.1

+ 2 - 0
go.sum

@@ -53,6 +53,8 @@ github.com/Necroforger/dgrouter v0.0.0-20200517224846-e66453b957c1 h1:3OHJOlf0r1
 github.com/Necroforger/dgrouter v0.0.0-20200517224846-e66453b957c1/go.mod h1:FdMxPfOp4ppZW2OJjLagSMri7g5k9luvTm7Y3aIxQSc=
 github.com/PuerkitoBio/goquery v1.6.1 h1:FgjbQZKl5HTmcn4sKBgvx8vv63nhyhIpv7lJpFGCWpk=
 github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/aidarkhanov/nanoid/v2 v2.0.5 h1:HLx5RyDuvOZ6YxlhYTxSU8Il+q7xVKmXM62MfSxziN0=
+github.com/aidarkhanov/nanoid/v2 v2.0.5/go.mod h1:YF/U48D1yA3AoGGUdRrCV95J/KJBShvR9TyLqQwdtlI=
 github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/azr/backoff v0.0.0-20160115115103-53511d3c7330 h1:ekDALXAVvY/Ub1UtNta3inKQwZ/jMB/zpOtD8rAYh78=