diff --git a/cmd/panel/main.go b/cmd/panel/main.go index 923fa80..4609d3d 100644 --- a/cmd/panel/main.go +++ b/cmd/panel/main.go @@ -33,7 +33,7 @@ func main() { database.ConnectToDatabase() cache.Instance = cache.NewCache() - manage.Archiver = archiverclient.NewArchiverClientWithTimeout(config.Conf.Bot.ObjectStore, time.Second*15) + manage.Archiver = archiverclient.NewArchiverClientWithTimeout(config.Conf.Bot.ObjectStore, time.Second*15, []byte(config.Conf.Bot.AesKey)) utils.LoadEmoji() diff --git a/config.toml.example b/config.toml.example index 8370371..a7c9bea 100644 --- a/config.toml.example +++ b/config.toml.example @@ -23,6 +23,8 @@ uri="postgres://user:pwd@localhost:5432/database?pool_max_conns=10" token="" premium-lookup-proxy-url="http://localhost:3000" premium-lookup-proxy-key="" +objectstore="" +aes-key="" [redis] host="127.0.0.1" diff --git a/config/config.go b/config/config.go index 98f0146..35870a1 100644 --- a/config/config.go +++ b/config/config.go @@ -51,6 +51,7 @@ type ( PremiumLookupProxyUrl string `toml:"premium-lookup-proxy-url"` PremiumLookupProxyKey string `toml:"premium-lookup-proxy-key"` ObjectStore string + AesKey string `toml:"aes-key"` } Redis struct { diff --git a/go.mod b/go.mod index f069d82..e724a54 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,10 @@ go 1.14 require ( github.com/BurntSushi/toml v0.3.1 - github.com/TicketsBot/archiverclient v0.0.0-20200425115930-0ca198cc8306 - github.com/TicketsBot/common v0.0.0-20200529141045-7426ad13f1a4 + github.com/TicketsBot/archiverclient v0.0.0-20200702201017-5511592e1e71 + github.com/TicketsBot/common v0.0.0-20200702195837-7afe5e77d1df github.com/TicketsBot/database v0.0.0-20200620140717-f747a0bb4238 + github.com/TicketsBot/logarchiver v0.0.0-20200425163447-199b93429026 // indirect github.com/apex/log v1.1.2 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible @@ -19,9 +20,10 @@ require ( github.com/gorilla/sessions v1.2.0 // indirect github.com/gorilla/websocket v1.4.2 github.com/jackc/pgx/v4 v4.6.0 + github.com/klauspost/compress v1.10.10 // indirect github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c github.com/pkg/errors v0.9.1 - github.com/rxdn/gdl v0.0.0-20200522202912-4ae241eb98c1 + github.com/rxdn/gdl v0.0.0-20200618155240-edb9ae72ef6e github.com/sirupsen/logrus v1.5.0 github.com/ulule/limiter/v3 v3.5.0 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a