mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 06:52:26 -05:00 
			
		
		
		
	[chore] update go dependencies (#4304)
- github.com/KimMachineGun/automemlimit v0.7.2 => v0.7.3
- github.com/gin-contrib/cors v1.7.5 => v1.7.6
- github.com/minio/minio-go/v7 v7.0.92 => v7.0.94
- github.com/spf13/cast v1.8.0 => v1.9.2
- github.com/uptrace/bun{,/*} v1.2.11 => v1.2.14
- golang.org/x/image v0.27.0 => v0.28.0
- golang.org/x/net v0.40.0 => v0.41.0
- code.superseriousbusiness.org/go-swagger v0.31.0-gts-go1.23-fix => v0.32.3-gts-go1.23-fix
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4304
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
	
	
This commit is contained in:
		
					parent
					
						
							
								7712885038
							
						
					
				
			
			
				commit
				
					
						8b0ea56027
					
				
			
		
					 294 changed files with 139999 additions and 21873 deletions
				
			
		
							
								
								
									
										25
									
								
								vendor/github.com/prometheus/common/model/time.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										25
									
								
								vendor/github.com/prometheus/common/model/time.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -201,6 +201,7 @@ var unitMap = map[string]struct { | |||
| 
 | ||||
| // ParseDuration parses a string into a time.Duration, assuming that a year | ||||
| // always has 365d, a week always has 7d, and a day always has 24h. | ||||
| // Negative durations are not supported. | ||||
| func ParseDuration(s string) (Duration, error) { | ||||
| 	switch s { | ||||
| 	case "0": | ||||
|  | @ -253,18 +254,36 @@ func ParseDuration(s string) (Duration, error) { | |||
| 			return 0, errors.New("duration out of range") | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	return Duration(dur), nil | ||||
| } | ||||
| 
 | ||||
| // ParseDurationAllowNegative is like ParseDuration but also accepts negative durations. | ||||
| func ParseDurationAllowNegative(s string) (Duration, error) { | ||||
| 	if s == "" || s[0] != '-' { | ||||
| 		return ParseDuration(s) | ||||
| 	} | ||||
| 
 | ||||
| 	d, err := ParseDuration(s[1:]) | ||||
| 
 | ||||
| 	return -d, err | ||||
| } | ||||
| 
 | ||||
| func (d Duration) String() string { | ||||
| 	var ( | ||||
| 		ms = int64(time.Duration(d) / time.Millisecond) | ||||
| 		r  = "" | ||||
| 		ms   = int64(time.Duration(d) / time.Millisecond) | ||||
| 		r    = "" | ||||
| 		sign = "" | ||||
| 	) | ||||
| 
 | ||||
| 	if ms == 0 { | ||||
| 		return "0s" | ||||
| 	} | ||||
| 
 | ||||
| 	if ms < 0 { | ||||
| 		sign, ms = "-", -ms | ||||
| 	} | ||||
| 
 | ||||
| 	f := func(unit string, mult int64, exact bool) { | ||||
| 		if exact && ms%mult != 0 { | ||||
| 			return | ||||
|  | @ -286,7 +305,7 @@ func (d Duration) String() string { | |||
| 	f("s", 1000, false) | ||||
| 	f("ms", 1, false) | ||||
| 
 | ||||
| 	return r | ||||
| 	return sign + r | ||||
| } | ||||
| 
 | ||||
| // MarshalJSON implements the json.Marshaler interface. | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue