add build date / commit info to version

sagan · Jan 16, 2024 · 471fdbe · 471fdbe
1 parent ce5a0e9
commit 471fdbe
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 67 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -1,5 +1,7 @@
 # This is an example .goreleaser.yml file with some sensible defaults.
 # Make sure to check the documentation at https://goreleaser.com
+# Docs:
+# https://goreleaser.com/customization/builds/
 before:
   hooks:
     # You may remove this if you don't use go modules.
@@ -18,22 +20,23 @@ builds:
         goarch: 386
       - goos: linux
         goarch: 386
+    ldflags:
+      - -s -w -X github.com/sagan/ptool/version.Version={{.Version}} -X github.com/sagan/ptool/version.Commit={{.Commit}} -X github.com/sagan/ptool/version.Date={{.Date}} -X main.builtBy=goreleaser
 archives:
   - format: zip
     # this name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
       {{ .ProjectName }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}
 checksum:
-  name_template: 'checksums.txt'
+  name_template: "checksums.txt"
 snapshot:
   name_template: "{{ incpatch .Version }}-snapshot"
 changelog:
   sort: asc
   filters:
     exclude:
-      - '^docs:'
-      - '^test:'
-
+      - "^docs:"
+      - "^test:"
 # The lines beneath this are called `modelines`. See `:help modeline`
 # Feel free to remove those if you don't want/use them.
 # yaml-language-server: $schema=https://goreleaser.com/static/schema.json

diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -29,7 +29,7 @@ It's a free and open-source software, visit https://github.com/sagan/ptool for m
 	SilenceUsage:       true,
 	DisableSuggestions: true,
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		if config.InShell && config.Get().ShellMaxHistory != 0 {
+		if config.InShell && config.Get().ShellMaxHistory > 0 {
 			in := strings.Join(os.Args[1:], " ")
 			ShellHistory.Write(in)
 		}

diff --git a/cmd/iyuu/api.go b/cmd/iyuu/api.go
@@ -88,7 +88,7 @@ func IyuuApiHash(token string, infoHashes []string) (map[string][]IyuuTorrentInf
 		return infoHashes[i] < infoHashes[j]
 	})
 	hash, _ := json.Marshal(&infoHashes)
-	apiUrl := "https://api.iyuu.cn/index.php?s=App.Api.Hash"
+	apiUrl := util.ParseRelativeUrl("index.php?s=App.Api.Hash", config.Get().IyuuDomain)
 	data := url.Values{
 		"sign":      {token},
 		"timestamp": {fmt.Sprint(util.Now())},
@@ -114,14 +114,14 @@ func IyuuApiHash(token string, infoHashes []string) (map[string][]IyuuTorrentInf
 }
 
 func IyuuApiGetUser(token string) (data map[string]any, err error) {
-	err = util.FetchJson("https://api.iyuu.cn/index.php?s=App.Api.GetUser&sign="+token, &data, nil)
+	err = util.FetchJson(util.ParseRelativeUrl("index.php?s=App.Api.GetUser&sign="+token, config.Get().IyuuDomain), &data, nil)
 	return
 }
 
 func IyuuApiSites(token string) ([]IyuuApiSite, error) {
 	resData := &IyuuApiSitesResponse{}
-	err := util.FetchJson("https://api.iyuu.cn/index.php?s=App.Api.Sites&version="+
-		IYUU_VERSION+"&sign="+token, resData, nil)
+	err := util.FetchJson(util.ParseRelativeUrl("index.php?s=App.Api.Sites&version="+
+		IYUU_VERSION+"&sign="+token, config.Get().IyuuDomain), resData, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -132,8 +132,8 @@ func IyuuApiSites(token string) ([]IyuuApiSite, error) {
 }
 
 func IyuuApiBind(token string, site string, uid int64, passkey string) (map[string]any, error) {
-	apiUrl := "https://api.iyuu.cn/index.php?s=App.Api.Bind&token=" + token +
-		"&site=" + site + "&id=" + fmt.Sprint(uid) + "&passkey=" + util.Sha1String(passkey)
+	apiUrl := util.ParseRelativeUrl("index.php?s=App.Api.Bind&token="+token+
+		"&site="+site+"&id="+fmt.Sprint(uid)+"&passkey="+util.Sha1String(passkey), config.Get().IyuuDomain)
 
 	resData := &IyuuApiResponse{}
 	err := util.FetchJson(apiUrl, &resData, nil)
@@ -147,7 +147,7 @@ func IyuuApiBind(token string, site string, uid int64, passkey string) (map[stri
 }
 
 func IyuuApiGetRecommendSites() ([]IyuuApiRecommendSite, error) {
-	apiUrl := "https://api.iyuu.cn/index.php?s=App.Api.GetRecommendSites"
+	apiUrl := util.ParseRelativeUrl("index.php?s=App.Api.GetRecommendSites", config.Get().IyuuDomain)
 
 	var resData *IyuuGetRecommendSitesResponse
 	err := util.FetchJson(apiUrl, &resData, nil)

diff --git a/cmd/versioncmd/versioncmd.go b/cmd/versioncmd/versioncmd.go
@@ -53,6 +53,8 @@ func versioncmd(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 	fmt.Printf("ptool %s\n", version.Version)
+	fmt.Printf("- build/date: %s\n", version.Date)
+	fmt.Printf("- build/commit: %s\n", version.Commit)
 	fmt.Printf("- os/type: %s\n", runtime.GOOS)
 	fmt.Printf("- os/arch: %s\n", runtime.GOARCH)
 	fmt.Printf("- go/version: %s\n", runtime.Version())

diff --git a/config/config.go b/config/config.go
@@ -25,6 +25,7 @@ const (
 	STATS_FILENAME   = "ptool_stats.txt"
 	HISTORY_FILENAME = "ptool_history"
 
+	DEFAULT_IYUU_DOMAIN                             = "api.iyuu.cn"
 	DEFAULT_TIMEOUT                                 = int64(5)
 	DEFAULT_SHELL_MAX_SUGGESTIONS                   = int64(5)
 	DEFAULT_SHELL_MAX_HISTORY                       = int64(500)
@@ -161,8 +162,9 @@ type SiteConfigStruct struct {
 type ConfigStruct struct {
 	Hushshell           bool                       `yaml:"hushshell"`
 	ShellMaxSuggestions int64                      `yaml:"shellMaxSuggestions"`
-	ShellMaxHistory     int64                      `yaml:"shellMaxHistory"`
+	ShellMaxHistory     int64                      `yaml:"shellMaxHistory"` // -1 禁用
 	IyuuToken           string                     `yaml:"iyuuToken"`
+	IyuuDomain          string                     `yaml:"iyuuDomain"` // iyuu API 域名。默认使用 api.iyuu.cn
 	SiteProxy           string                     `yaml:"siteProxy"`
 	SiteUserAgent       string                     `yaml:"siteUserAgent"`
 	SiteImpersonate     string                     `yaml:"siteImpersonate"`
@@ -183,23 +185,23 @@ type ConfigStruct struct {
 }
 
 var (
-	VerboseLevel                        = 0
-	InShell                             = false
-	Initialized                         = false
-	ConfigDir                           = "" // "/root/.config/ptool"
-	ConfigFile                          = "" // "ptool.toml"
-	DefaultConfigFile                   = "" // set when start
-	ConfigName                          = "" // "ptool"
-	ConfigType                          = "" // "toml"
-	LockFile                            = ""
-	LockOrExit                          = false
-	Fork                                = false
-	configData            *ConfigStruct = &ConfigStruct{}
-	clientsConfigMap                    = map[string]*ClientConfigStruct{}
-	sitesConfigMap                      = map[string]*SiteConfigStruct{}
-	aliasesConfigMap                    = map[string]*AliasConfigStruct{}
-	groupsConfigMap                     = map[string]*GroupConfigStruct{}
-	cookiecloudsConfigMap               = map[string]*CookiecloudConfigStruct{}
+	VerboseLevel          = 0
+	InShell               = false
+	Initialized           = false
+	ConfigDir             = "" // "/root/.config/ptool"
+	ConfigFile            = "" // "ptool.toml"
+	DefaultConfigFile     = "" // set when start
+	ConfigName            = "" // "ptool"
+	ConfigType            = "" // "toml"
+	LockFile              = ""
+	LockOrExit            = false
+	Fork                  = false
+	configData            *ConfigStruct
+	clientsConfigMap      = map[string]*ClientConfigStruct{}
+	sitesConfigMap        = map[string]*SiteConfigStruct{}
+	aliasesConfigMap      = map[string]*AliasConfigStruct{}
+	groupsConfigMap       = map[string]*GroupConfigStruct{}
+	cookiecloudsConfigMap = map[string]*CookiecloudConfigStruct{}
 	once                  sync.Once
 )
 
@@ -264,17 +266,29 @@ func Get() *ConfigStruct {
 		viper.SetConfigName(ConfigName)
 		viper.SetConfigType(ConfigType)
 		viper.AddConfigPath(ConfigDir)
-		viper.SetDefault("ShellMaxSuggestions", DEFAULT_SHELL_MAX_SUGGESTIONS)
-		viper.SetDefault("ShellMaxHistory", DEFAULT_SHELL_MAX_HISTORY)
 		err := viper.ReadInConfig()
 		if err != nil {
-			log.Fatalf("Fail to read config file: %v", err)
+			log.Errorf("Fail to read config file: %v", err)
+		} else {
+			err = viper.Unmarshal(&configData)
+			if err != nil {
+				log.Errorf("Fail to parse config file: %v", err)
+			}
 		}
-		err = viper.Unmarshal(&configData)
 		if err != nil {
-			log.Fatalf("Fail to parse config file: %v", err)
+			configData = &ConfigStruct{}
+		}
+		if configData.IyuuDomain == "" {
+			configData.IyuuDomain = DEFAULT_IYUU_DOMAIN
+		}
+		if configData.ShellMaxSuggestions == 0 {
+			configData.ShellMaxSuggestions = DEFAULT_SHELL_MAX_SUGGESTIONS
+		} else if configData.ShellMaxSuggestions < 0 {
+			configData.ShellMaxSuggestions = 0
+		}
+		if configData.ShellMaxHistory == 0 {
+			configData.ShellMaxHistory = DEFAULT_SHELL_MAX_HISTORY
 		}
-
 		for _, client := range configData.Clients {
 			v, err := util.RAMInBytes(client.BrushMinDiskSpace)
 			if err != nil || v < 0 {

diff --git a/go.mod b/go.mod
@@ -2,9 +2,6 @@ module github.com/sagan/ptool
 
 go 1.21
 
-// workaround for https://github.com/Noooste/azuretls-client/issues/27
-replace github.com/Noooste/azuretls-client v1.2.5 => github.com/sagan/azuretls-client v0.0.0-20240110021915-00703735ede6
-
 // workaround for some problem
 replace github.com/hekmon/transmissionrpc/v2 => ./transmissionrpc
 
@@ -15,7 +12,7 @@ replace github.com/c-bata/go-prompt => ./go-prompt
 replace github.com/stromland/cobra-prompt => ./cobra-prompt
 
 require (
-	github.com/Noooste/azuretls-client v1.2.5
+	github.com/Noooste/azuretls-client v1.2.6
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/anacrolix/torrent v1.53.2
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8
@@ -32,8 +29,8 @@ require (
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/viper v1.18.2
 	github.com/stromland/cobra-prompt v0.5.0
-	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
-	golang.org/x/net v0.19.0
+	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
+	golang.org/x/net v0.20.0
 	gorm.io/gorm v1.25.5
 )
 
@@ -42,7 +39,7 @@ require (
 	github.com/google/uuid v1.5.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	modernc.org/libc v1.38.0 // indirect
+	modernc.org/libc v1.40.4 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.7.2 // indirect
 	modernc.org/sqlite v1.28.0 // indirect
@@ -54,7 +51,7 @@ require (
 	github.com/Noooste/websocket v1.0.1 // indirect
 	github.com/anacrolix/missinggo v1.3.0 // indirect
 	github.com/anacrolix/missinggo/v2 v2.7.3 // indirect
-	github.com/andybalholm/brotli v1.0.6 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/andybalholm/cascadia v1.3.2 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -81,9 +78,8 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

diff --git a/go.sum b/go.sum
@@ -3,6 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797/go.mod h1:sXBiorCo8c46JlQV3oXPKINnZ8mcqnye1EkVkqsectk=
 crawshaw.io/sqlite v0.3.2/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Noooste/azuretls-client v1.2.6 h1:nlMJzEhPKK9nvmycf9JatZMT9VX2nSDbPiLmNHKzGPI=
+github.com/Noooste/azuretls-client v1.2.6/go.mod h1:rwvPqrRn5b//KMAQcUBJBhm9peHxcJeZWR9nu7XFP+8=
 github.com/Noooste/fhttp v1.0.6 h1:E1u8b+GMhRZSuoINNpiXjE1MHUdZMIcs/g4HEjapWLg=
 github.com/Noooste/fhttp v1.0.6/go.mod h1:7rH441v5BuOAQ60LPj7Uwinew1bmv7A0q8DryN/YA6s=
 github.com/Noooste/utls v1.1.2/go.mod h1:OG1Bui9jXgt8CkFGoUBuD8lQthczDlAp4gHwRtXtpSQ=
@@ -46,8 +48,8 @@ github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CM
 github.com/anacrolix/torrent v1.53.2 h1:dW+ficSC8sJaGrUvZJizORPBLTP7XR8idl2oGlrUutQ=
 github.com/anacrolix/torrent v1.53.2/go.mod h1:d1NANCFAd9/nv9vmHnYUobLdyBSAoFYohojHjGmcAsw=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
-github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
 github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
@@ -265,8 +267,6 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
-github.com/sagan/azuretls-client v0.0.0-20240110021915-00703735ede6 h1:epOJvq9yJK8+NEitfWQnv9PJ8DE+djCTU8nTtJ7pZ+E=
-github.com/sagan/azuretls-client v0.0.0-20240110021915-00703735ede6/go.mod h1:rwvPqrRn5b//KMAQcUBJBhm9peHxcJeZWR9nu7XFP+8=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
@@ -316,20 +316,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
-go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -355,8 +353,8 @@ golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -426,8 +424,8 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
-golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
@@ -464,8 +462,8 @@ gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
 gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-modernc.org/libc v1.38.0 h1:o4Lpk0zNDSdsjfEXnF1FGXWQ9PDi1NOdWcLP5n13FGo=
-modernc.org/libc v1.38.0/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
+modernc.org/libc v1.40.4 h1:7GNrz+Zds8OZMHUqnxNBtgg1LJud1dbMNRVdd75EoMg=
+modernc.org/libc v1.40.4/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=