mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 04:22:25 -05:00 
			
		
		
		
	Update dependencies (#333)
This commit is contained in:
		
					parent
					
						
							
								ce22e03f9d
							
						
					
				
			
			
				commit
				
					
						182b4eea73
					
				
			
		
					 848 changed files with 377869 additions and 107280 deletions
				
			
		
							
								
								
									
										28
									
								
								vendor/github.com/gin-gonic/gin/render/json.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										28
									
								
								vendor/github.com/gin-gonic/gin/render/json.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -46,11 +46,9 @@ type PureJSON struct { | |||
| 	Data interface{} | ||||
| } | ||||
| 
 | ||||
| var ( | ||||
| 	jsonContentType      = []string{"application/json; charset=utf-8"} | ||||
| 	jsonpContentType     = []string{"application/javascript; charset=utf-8"} | ||||
| 	jsonASCIIContentType = []string{"application/json"} | ||||
| ) | ||||
| var jsonContentType = []string{"application/json; charset=utf-8"} | ||||
| var jsonpContentType = []string{"application/javascript; charset=utf-8"} | ||||
| var jsonAsciiContentType = []string{"application/json"} | ||||
| 
 | ||||
| // Render (JSON) writes data with custom ContentType. | ||||
| func (r JSON) Render(w http.ResponseWriter) (err error) { | ||||
|  | @ -102,7 +100,8 @@ func (r SecureJSON) Render(w http.ResponseWriter) error { | |||
| 	// if the jsonBytes is array values | ||||
| 	if bytes.HasPrefix(jsonBytes, bytesconv.StringToBytes("[")) && bytes.HasSuffix(jsonBytes, | ||||
| 		bytesconv.StringToBytes("]")) { | ||||
| 		if _, err = w.Write(bytesconv.StringToBytes(r.Prefix)); err != nil { | ||||
| 		_, err = w.Write(bytesconv.StringToBytes(r.Prefix)) | ||||
| 		if err != nil { | ||||
| 			return err | ||||
| 		} | ||||
| 	} | ||||
|  | @ -129,19 +128,20 @@ func (r JsonpJSON) Render(w http.ResponseWriter) (err error) { | |||
| 	} | ||||
| 
 | ||||
| 	callback := template.JSEscapeString(r.Callback) | ||||
| 	if _, err = w.Write(bytesconv.StringToBytes(callback)); err != nil { | ||||
| 	_, err = w.Write(bytesconv.StringToBytes(callback)) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	if _, err = w.Write(bytesconv.StringToBytes("(")); err != nil { | ||||
| 	_, err = w.Write(bytesconv.StringToBytes("(")) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	if _, err = w.Write(ret); err != nil { | ||||
| 	_, err = w.Write(ret) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	if _, err = w.Write(bytesconv.StringToBytes(");")); err != nil { | ||||
| 	_, err = w.Write(bytesconv.StringToBytes(");")) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
|  | @ -176,7 +176,7 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) { | |||
| 
 | ||||
| // WriteContentType (AsciiJSON) writes JSON ContentType. | ||||
| func (r AsciiJSON) WriteContentType(w http.ResponseWriter) { | ||||
| 	writeContentType(w, jsonASCIIContentType) | ||||
| 	writeContentType(w, jsonAsciiContentType) | ||||
| } | ||||
| 
 | ||||
| // Render (PureJSON) writes custom ContentType and encodes the given interface object. | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue