mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-23 12:16:38 +00:00
fc3741365c
* 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>
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
package internal
|
|
|
|
import (
|
|
"net/url"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
defaultHTTPPort = ":80"
|
|
defaultHTTPSPort = ":443"
|
|
)
|
|
|
|
// Regular expressions used by the normalizations
|
|
var rxPort = regexp.MustCompile(`(:\d+)/?$`)
|
|
var rxDupSlashes = regexp.MustCompile(`/{2,}`)
|
|
|
|
// NormalizeURL will normalize the specified URL
|
|
// This was added to replace a previous call to the no longer maintained purell library:
|
|
// The call that was used looked like the following:
|
|
//
|
|
// url.Parse(purell.NormalizeURL(parsed, purell.FlagsSafe|purell.FlagRemoveDuplicateSlashes))
|
|
//
|
|
// To explain all that was included in the call above, purell.FlagsSafe was really just the following:
|
|
// - FlagLowercaseScheme
|
|
// - FlagLowercaseHost
|
|
// - FlagRemoveDefaultPort
|
|
// - FlagRemoveDuplicateSlashes (and this was mixed in with the |)
|
|
//
|
|
// This also normalizes the URL into its urlencoded form by removing RawPath and RawFragment.
|
|
func NormalizeURL(u *url.URL) {
|
|
lowercaseScheme(u)
|
|
lowercaseHost(u)
|
|
removeDefaultPort(u)
|
|
removeDuplicateSlashes(u)
|
|
|
|
u.RawPath = ""
|
|
u.RawFragment = ""
|
|
}
|
|
|
|
func lowercaseScheme(u *url.URL) {
|
|
if len(u.Scheme) > 0 {
|
|
u.Scheme = strings.ToLower(u.Scheme)
|
|
}
|
|
}
|
|
|
|
func lowercaseHost(u *url.URL) {
|
|
if len(u.Host) > 0 {
|
|
u.Host = strings.ToLower(u.Host)
|
|
}
|
|
}
|
|
|
|
func removeDefaultPort(u *url.URL) {
|
|
if len(u.Host) > 0 {
|
|
scheme := strings.ToLower(u.Scheme)
|
|
u.Host = rxPort.ReplaceAllStringFunc(u.Host, func(val string) string {
|
|
if (scheme == "http" && val == defaultHTTPPort) || (scheme == "https" && val == defaultHTTPSPort) {
|
|
return ""
|
|
}
|
|
return val
|
|
})
|
|
}
|
|
}
|
|
|
|
func removeDuplicateSlashes(u *url.URL) {
|
|
if len(u.Path) > 0 {
|
|
u.Path = rxDupSlashes.ReplaceAllString(u.Path, "/")
|
|
}
|
|
}
|