mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-11-03 16:32:24 -06:00 
			
		
		
		
	[chore] update dependencies (#4423)
- codeberg.org/gruf/go-ffmpreg: v0.6.10 -> v0.6.11 - github.com/spf13/cast: v1.9.2 -> v1.10.0 - github.com/spf13/viper: v1.20.1 -> v1.21.0 - golang.org/x/crypto: v0.41.0 -> v0.42.0 - golang.org/x/image: v0.30.0 -> v0.31.0 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4423 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
		
					parent
					
						
							
								a6429b5410
							
						
					
				
			
			
				commit
				
					
						c949b9f2d1
					
				
			
		
					 97 changed files with 14611 additions and 3494 deletions
				
			
		
							
								
								
									
										42
									
								
								vendor/github.com/spf13/viper/viper.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										42
									
								
								vendor/github.com/spf13/viper/viper.go
									
										
									
										generated
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -376,7 +376,12 @@ func (v *Viper) WatchConfig() {
 | 
			
		|||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}()
 | 
			
		||||
		watcher.Add(configDir)
 | 
			
		||||
		err = watcher.Add(configDir)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			v.logger.Error(fmt.Sprintf("failed to add watcher: %s", err))
 | 
			
		||||
			initWG.Done()
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		initWG.Done()   // done initializing the watch in this go routine, so the parent routine can move on...
 | 
			
		||||
		eventsWG.Wait() // now, wait for event loop to end in this go-routine...
 | 
			
		||||
	}()
 | 
			
		||||
| 
						 | 
				
			
			@ -1181,11 +1186,26 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) any {
 | 
			
		|||
			s = strings.TrimSuffix(s, "]")
 | 
			
		||||
			res, _ := readAsCSV(s)
 | 
			
		||||
			return res
 | 
			
		||||
		case "boolSlice":
 | 
			
		||||
			s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
			s = strings.TrimSuffix(s, "]")
 | 
			
		||||
			res, _ := readAsCSV(s)
 | 
			
		||||
			return cast.ToBoolSlice(res)
 | 
			
		||||
		case "intSlice":
 | 
			
		||||
			s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
			s = strings.TrimSuffix(s, "]")
 | 
			
		||||
			res, _ := readAsCSV(s)
 | 
			
		||||
			return cast.ToIntSlice(res)
 | 
			
		||||
		case "uintSlice":
 | 
			
		||||
			s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
			s = strings.TrimSuffix(s, "]")
 | 
			
		||||
			res, _ := readAsCSV(s)
 | 
			
		||||
			return cast.ToUintSlice(res)
 | 
			
		||||
		case "float64Slice":
 | 
			
		||||
			s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
			s = strings.TrimSuffix(s, "]")
 | 
			
		||||
			res, _ := readAsCSV(s)
 | 
			
		||||
			return cast.ToFloat64Slice(res)
 | 
			
		||||
		case "durationSlice":
 | 
			
		||||
			s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
			s = strings.TrimSuffix(s, "]")
 | 
			
		||||
| 
						 | 
				
			
			@ -1268,11 +1288,26 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) any {
 | 
			
		|||
				s = strings.TrimSuffix(s, "]")
 | 
			
		||||
				res, _ := readAsCSV(s)
 | 
			
		||||
				return res
 | 
			
		||||
			case "boolSlice":
 | 
			
		||||
				s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
				s = strings.TrimSuffix(s, "]")
 | 
			
		||||
				res, _ := readAsCSV(s)
 | 
			
		||||
				return cast.ToBoolSlice(res)
 | 
			
		||||
			case "intSlice":
 | 
			
		||||
				s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
				s = strings.TrimSuffix(s, "]")
 | 
			
		||||
				res, _ := readAsCSV(s)
 | 
			
		||||
				return cast.ToIntSlice(res)
 | 
			
		||||
			case "uintSlice":
 | 
			
		||||
				s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
				s = strings.TrimSuffix(s, "]")
 | 
			
		||||
				res, _ := readAsCSV(s)
 | 
			
		||||
				return cast.ToUintSlice(res)
 | 
			
		||||
			case "float64Slice":
 | 
			
		||||
				s := strings.TrimPrefix(flag.ValueString(), "[")
 | 
			
		||||
				s = strings.TrimSuffix(s, "]")
 | 
			
		||||
				res, _ := readAsCSV(s)
 | 
			
		||||
				return cast.ToFloat64Slice(res)
 | 
			
		||||
			case "stringToString":
 | 
			
		||||
				return stringToStringConv(flag.ValueString())
 | 
			
		||||
			case "stringToInt":
 | 
			
		||||
| 
						 | 
				
			
			@ -1670,7 +1705,10 @@ func (v *Viper) unmarshalReader(in io.Reader, c map[string]any) error {
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	buf := new(bytes.Buffer)
 | 
			
		||||
	buf.ReadFrom(in)
 | 
			
		||||
	_, err := buf.ReadFrom(in)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return fmt.Errorf("failed to read configuration from input: %w", err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// TODO: remove this once SupportedExts is deprecated/removed
 | 
			
		||||
	if !slices.Contains(SupportedExts, format) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue