mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 02:12:24 -05:00 
			
		
		
		
	[bugfix] Fix Swagger spec and add test script (#2698)
* Add Swagger spec test script * Fix Swagger spec errors not related to statuses with polls * Add API tests that post a status with a poll * Fix creating a status with a poll from form params * Fix Swagger spec errors related to statuses with polls (this is the last error) * Fix Swagger spec warnings not related to unused definitions * Suppress a duplicate list update params definition that was somehow causing wrong param names * Add Swagger test to CI - updates Drone config - vendorizes go-swagger - fixes a file extension issue that caused the test script to generate JSON instead of YAML with the vendorized version * Put `Sample: ` on its own line everywhere * Remove unused id param from emojiCategoriesGet * Add 5 more pairs of profile fields to account update API Swagger * Remove Swagger prefix from dummy fields It makes the generated code look weird * Manually annotate params for statusCreate operation * Fix all remaining Swagger spec warnings - Change some models into operation parameters - Ignore models that already correspond to manually documented operation parameters but can't be trivially changed (those with file fields) * Documented that creating a status with scheduled_at isn't implemented yet * sign drone.yml * Fix filter API Swagger errors * fixup! Fix filter API Swagger errors --------- Co-authored-by: tobi <tobi.smethurst@protonmail.com>
This commit is contained in:
		
					parent
					
						
							
								68c8fe67cc
							
						
					
				
			
			
				commit
				
					
						fc3741365c
					
				
			
		
					 672 changed files with 135624 additions and 713 deletions
				
			
		
							
								
								
									
										91
									
								
								vendor/github.com/go-openapi/spec/properties.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										91
									
								
								vendor/github.com/go-openapi/spec/properties.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,91 @@ | |||
| package spec | ||||
| 
 | ||||
| import ( | ||||
| 	"bytes" | ||||
| 	"encoding/json" | ||||
| 	"reflect" | ||||
| 	"sort" | ||||
| ) | ||||
| 
 | ||||
| // OrderSchemaItem holds a named schema (e.g. from a property of an object) | ||||
| type OrderSchemaItem struct { | ||||
| 	Name string | ||||
| 	Schema | ||||
| } | ||||
| 
 | ||||
| // OrderSchemaItems is a sortable slice of named schemas. | ||||
| // The ordering is defined by the x-order schema extension. | ||||
| type OrderSchemaItems []OrderSchemaItem | ||||
| 
 | ||||
| // MarshalJSON produces a json object with keys defined by the name schemas | ||||
| // of the OrderSchemaItems slice, keeping the original order of the slice. | ||||
| func (items OrderSchemaItems) MarshalJSON() ([]byte, error) { | ||||
| 	buf := bytes.NewBuffer(nil) | ||||
| 	buf.WriteString("{") | ||||
| 	for i := range items { | ||||
| 		if i > 0 { | ||||
| 			buf.WriteString(",") | ||||
| 		} | ||||
| 		buf.WriteString("\"") | ||||
| 		buf.WriteString(items[i].Name) | ||||
| 		buf.WriteString("\":") | ||||
| 		bs, err := json.Marshal(&items[i].Schema) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
| 		buf.Write(bs) | ||||
| 	} | ||||
| 	buf.WriteString("}") | ||||
| 	return buf.Bytes(), nil | ||||
| } | ||||
| 
 | ||||
| func (items OrderSchemaItems) Len() int      { return len(items) } | ||||
| func (items OrderSchemaItems) Swap(i, j int) { items[i], items[j] = items[j], items[i] } | ||||
| func (items OrderSchemaItems) Less(i, j int) (ret bool) { | ||||
| 	ii, oki := items[i].Extensions.GetInt("x-order") | ||||
| 	ij, okj := items[j].Extensions.GetInt("x-order") | ||||
| 	if oki { | ||||
| 		if okj { | ||||
| 			defer func() { | ||||
| 				if err := recover(); err != nil { | ||||
| 					defer func() { | ||||
| 						if err = recover(); err != nil { | ||||
| 							ret = items[i].Name < items[j].Name | ||||
| 						} | ||||
| 					}() | ||||
| 					ret = reflect.ValueOf(ii).String() < reflect.ValueOf(ij).String() | ||||
| 				} | ||||
| 			}() | ||||
| 			return ii < ij | ||||
| 		} | ||||
| 		return true | ||||
| 	} else if okj { | ||||
| 		return false | ||||
| 	} | ||||
| 	return items[i].Name < items[j].Name | ||||
| } | ||||
| 
 | ||||
| // SchemaProperties is a map representing the properties of a Schema object. | ||||
| // It knows how to transform its keys into an ordered slice. | ||||
| type SchemaProperties map[string]Schema | ||||
| 
 | ||||
| // ToOrderedSchemaItems transforms the map of properties into a sortable slice | ||||
| func (properties SchemaProperties) ToOrderedSchemaItems() OrderSchemaItems { | ||||
| 	items := make(OrderSchemaItems, 0, len(properties)) | ||||
| 	for k, v := range properties { | ||||
| 		items = append(items, OrderSchemaItem{ | ||||
| 			Name:   k, | ||||
| 			Schema: v, | ||||
| 		}) | ||||
| 	} | ||||
| 	sort.Sort(items) | ||||
| 	return items | ||||
| } | ||||
| 
 | ||||
| // MarshalJSON produces properties as json, keeping their order. | ||||
| func (properties SchemaProperties) MarshalJSON() ([]byte, error) { | ||||
| 	if properties == nil { | ||||
| 		return []byte("null"), nil | ||||
| 	} | ||||
| 	return json.Marshal(properties.ToOrderedSchemaItems()) | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue