mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-27 22:26:40 +00:00
Compare commits
2 commits
c80ef9330a
...
33d3219ebb
Author | SHA1 | Date | |
---|---|---|---|
33d3219ebb | |||
d2820a1470 |
2
go.mod
2
go.mod
|
@ -41,7 +41,7 @@ require (
|
||||||
github.com/k3a/html2text v1.2.1
|
github.com/k3a/html2text v1.2.1
|
||||||
github.com/microcosm-cc/bluemonday v1.0.27
|
github.com/microcosm-cc/bluemonday v1.0.27
|
||||||
github.com/miekg/dns v1.1.62
|
github.com/miekg/dns v1.1.62
|
||||||
github.com/minio/minio-go/v7 v7.0.79
|
github.com/minio/minio-go/v7 v7.0.80
|
||||||
github.com/mitchellh/mapstructure v1.5.0
|
github.com/mitchellh/mapstructure v1.5.0
|
||||||
github.com/ncruces/go-sqlite3 v0.20.0
|
github.com/ncruces/go-sqlite3 v0.20.0
|
||||||
github.com/oklog/ulid v1.3.1
|
github.com/oklog/ulid v1.3.1
|
||||||
|
|
4
go.sum
generated
4
go.sum
generated
|
@ -411,8 +411,8 @@ github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
|
||||||
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
|
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
|
||||||
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
|
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
|
||||||
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
|
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
|
||||||
github.com/minio/minio-go/v7 v7.0.79 h1:SvJZpj3hT0RN+4KiuX/FxLfPZdsuegy6d/2PiemM/bM=
|
github.com/minio/minio-go/v7 v7.0.80 h1:2mdUHXEykRdY/BigLt3Iuu1otL0JTogT0Nmltg0wujk=
|
||||||
github.com/minio/minio-go/v7 v7.0.79/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
|
github.com/minio/minio-go/v7 v7.0.80/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
|
||||||
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
|
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
|
||||||
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
|
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
|
||||||
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
|
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
|
||||||
|
|
18
vendor/github.com/minio/minio-go/v7/api.go
generated
vendored
18
vendor/github.com/minio/minio-go/v7/api.go
generated
vendored
|
@ -99,6 +99,7 @@ type Client struct {
|
||||||
healthStatus int32
|
healthStatus int32
|
||||||
|
|
||||||
trailingHeaderSupport bool
|
trailingHeaderSupport bool
|
||||||
|
maxRetries int
|
||||||
}
|
}
|
||||||
|
|
||||||
// Options for New method
|
// Options for New method
|
||||||
|
@ -123,12 +124,16 @@ type Options struct {
|
||||||
// Custom hash routines. Leave nil to use standard.
|
// Custom hash routines. Leave nil to use standard.
|
||||||
CustomMD5 func() md5simd.Hasher
|
CustomMD5 func() md5simd.Hasher
|
||||||
CustomSHA256 func() md5simd.Hasher
|
CustomSHA256 func() md5simd.Hasher
|
||||||
|
|
||||||
|
// Number of times a request is retried. Defaults to 10 retries if this option is not configured.
|
||||||
|
// Set to 1 to disable retries.
|
||||||
|
MaxRetries int
|
||||||
}
|
}
|
||||||
|
|
||||||
// Global constants.
|
// Global constants.
|
||||||
const (
|
const (
|
||||||
libraryName = "minio-go"
|
libraryName = "minio-go"
|
||||||
libraryVersion = "v7.0.79"
|
libraryVersion = "v7.0.80"
|
||||||
)
|
)
|
||||||
|
|
||||||
// User Agent should always following the below style.
|
// User Agent should always following the below style.
|
||||||
|
@ -278,6 +283,11 @@ func privateNew(endpoint string, opts *Options) (*Client, error) {
|
||||||
// healthcheck is not initialized
|
// healthcheck is not initialized
|
||||||
clnt.healthStatus = unknown
|
clnt.healthStatus = unknown
|
||||||
|
|
||||||
|
clnt.maxRetries = MaxRetry
|
||||||
|
if opts.MaxRetries > 0 {
|
||||||
|
clnt.maxRetries = opts.MaxRetries
|
||||||
|
}
|
||||||
|
|
||||||
// Return.
|
// Return.
|
||||||
return clnt, nil
|
return clnt, nil
|
||||||
}
|
}
|
||||||
|
@ -590,9 +600,9 @@ func (c *Client) executeMethod(ctx context.Context, method string, metadata requ
|
||||||
return nil, errors.New(c.endpointURL.String() + " is offline.")
|
return nil, errors.New(c.endpointURL.String() + " is offline.")
|
||||||
}
|
}
|
||||||
|
|
||||||
var retryable bool // Indicates if request can be retried.
|
var retryable bool // Indicates if request can be retried.
|
||||||
var bodySeeker io.Seeker // Extracted seeker from io.Reader.
|
var bodySeeker io.Seeker // Extracted seeker from io.Reader.
|
||||||
reqRetry := MaxRetry // Indicates how many times we can retry the request
|
var reqRetry = c.maxRetries // Indicates how many times we can retry the request
|
||||||
|
|
||||||
if metadata.contentBody != nil {
|
if metadata.contentBody != nil {
|
||||||
// Check if body is seekable then it is retryable.
|
// Check if body is seekable then it is retryable.
|
||||||
|
|
26
vendor/github.com/minio/minio-go/v7/pkg/lifecycle/lifecycle.go
generated
vendored
26
vendor/github.com/minio/minio-go/v7/pkg/lifecycle/lifecycle.go
generated
vendored
|
@ -434,12 +434,34 @@ func (de DelMarkerExpiration) MarshalXML(enc *xml.Encoder, start xml.StartElemen
|
||||||
return enc.EncodeElement(delMarkerExp(de), start)
|
return enc.EncodeElement(delMarkerExp(de), start)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AllVersionsExpiration represents AllVersionsExpiration actions element in an ILM policy
|
||||||
|
type AllVersionsExpiration struct {
|
||||||
|
XMLName xml.Name `xml:"AllVersionsExpiration" json:"-"`
|
||||||
|
Days int `xml:"Days,omitempty" json:"Days,omitempty"`
|
||||||
|
DeleteMarker ExpireDeleteMarker `xml:"DeleteMarker,omitempty" json:"DeleteMarker,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsNull returns true if days field is 0
|
||||||
|
func (e AllVersionsExpiration) IsNull() bool {
|
||||||
|
return e.Days == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// MarshalXML satisfies xml.Marshaler to provide custom encoding
|
||||||
|
func (e AllVersionsExpiration) MarshalXML(enc *xml.Encoder, start xml.StartElement) error {
|
||||||
|
if e.IsNull() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
type allVersionsExp AllVersionsExpiration
|
||||||
|
return enc.EncodeElement(allVersionsExp(e), start)
|
||||||
|
}
|
||||||
|
|
||||||
// MarshalJSON customizes json encoding by omitting empty values
|
// MarshalJSON customizes json encoding by omitting empty values
|
||||||
func (r Rule) MarshalJSON() ([]byte, error) {
|
func (r Rule) MarshalJSON() ([]byte, error) {
|
||||||
type rule struct {
|
type rule struct {
|
||||||
AbortIncompleteMultipartUpload *AbortIncompleteMultipartUpload `json:"AbortIncompleteMultipartUpload,omitempty"`
|
AbortIncompleteMultipartUpload *AbortIncompleteMultipartUpload `json:"AbortIncompleteMultipartUpload,omitempty"`
|
||||||
Expiration *Expiration `json:"Expiration,omitempty"`
|
Expiration *Expiration `json:"Expiration,omitempty"`
|
||||||
DelMarkerExpiration *DelMarkerExpiration `json:"DelMarkerExpiration,omitempty"`
|
DelMarkerExpiration *DelMarkerExpiration `json:"DelMarkerExpiration,omitempty"`
|
||||||
|
AllVersionsExpiration *AllVersionsExpiration `json:"AllVersionsExpiration,omitempty"`
|
||||||
ID string `json:"ID"`
|
ID string `json:"ID"`
|
||||||
RuleFilter *Filter `json:"Filter,omitempty"`
|
RuleFilter *Filter `json:"Filter,omitempty"`
|
||||||
NoncurrentVersionExpiration *NoncurrentVersionExpiration `json:"NoncurrentVersionExpiration,omitempty"`
|
NoncurrentVersionExpiration *NoncurrentVersionExpiration `json:"NoncurrentVersionExpiration,omitempty"`
|
||||||
|
@ -475,6 +497,9 @@ type rule struct {
|
||||||
if !r.NoncurrentVersionTransition.isNull() {
|
if !r.NoncurrentVersionTransition.isNull() {
|
||||||
newr.NoncurrentVersionTransition = &r.NoncurrentVersionTransition
|
newr.NoncurrentVersionTransition = &r.NoncurrentVersionTransition
|
||||||
}
|
}
|
||||||
|
if !r.AllVersionsExpiration.IsNull() {
|
||||||
|
newr.AllVersionsExpiration = &r.AllVersionsExpiration
|
||||||
|
}
|
||||||
|
|
||||||
return json.Marshal(newr)
|
return json.Marshal(newr)
|
||||||
}
|
}
|
||||||
|
@ -485,6 +510,7 @@ type Rule struct {
|
||||||
AbortIncompleteMultipartUpload AbortIncompleteMultipartUpload `xml:"AbortIncompleteMultipartUpload,omitempty" json:"AbortIncompleteMultipartUpload,omitempty"`
|
AbortIncompleteMultipartUpload AbortIncompleteMultipartUpload `xml:"AbortIncompleteMultipartUpload,omitempty" json:"AbortIncompleteMultipartUpload,omitempty"`
|
||||||
Expiration Expiration `xml:"Expiration,omitempty" json:"Expiration,omitempty"`
|
Expiration Expiration `xml:"Expiration,omitempty" json:"Expiration,omitempty"`
|
||||||
DelMarkerExpiration DelMarkerExpiration `xml:"DelMarkerExpiration,omitempty" json:"DelMarkerExpiration,omitempty"`
|
DelMarkerExpiration DelMarkerExpiration `xml:"DelMarkerExpiration,omitempty" json:"DelMarkerExpiration,omitempty"`
|
||||||
|
AllVersionsExpiration AllVersionsExpiration `xml:"AllVersionsExpiration,omitempty" json:"AllVersionsExpiration,omitempty"`
|
||||||
ID string `xml:"ID" json:"ID"`
|
ID string `xml:"ID" json:"ID"`
|
||||||
RuleFilter Filter `xml:"Filter,omitempty" json:"Filter,omitempty"`
|
RuleFilter Filter `xml:"Filter,omitempty" json:"Filter,omitempty"`
|
||||||
NoncurrentVersionExpiration NoncurrentVersionExpiration `xml:"NoncurrentVersionExpiration,omitempty" json:"NoncurrentVersionExpiration,omitempty"`
|
NoncurrentVersionExpiration NoncurrentVersionExpiration `xml:"NoncurrentVersionExpiration,omitempty" json:"NoncurrentVersionExpiration,omitempty"`
|
||||||
|
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
|
@ -483,7 +483,7 @@ github.com/miekg/dns
|
||||||
# github.com/minio/md5-simd v1.1.2
|
# github.com/minio/md5-simd v1.1.2
|
||||||
## explicit; go 1.14
|
## explicit; go 1.14
|
||||||
github.com/minio/md5-simd
|
github.com/minio/md5-simd
|
||||||
# github.com/minio/minio-go/v7 v7.0.79
|
# github.com/minio/minio-go/v7 v7.0.80
|
||||||
## explicit; go 1.22
|
## explicit; go 1.22
|
||||||
github.com/minio/minio-go/v7
|
github.com/minio/minio-go/v7
|
||||||
github.com/minio/minio-go/v7/pkg/cors
|
github.com/minio/minio-go/v7/pkg/cors
|
||||||
|
|
Loading…
Reference in a new issue