Extract the project slug more betterly

This commit is contained in:
Ben Visness 2021-07-30 22:31:43 -05:00
parent bde7c576e3
commit b9645a6315
2 changed files with 6 additions and 5 deletions

View File

@ -56,6 +56,10 @@ func SetS3BaseUrl(base string) {
S3BaseUrl = base
}
func GetBaseHost() string {
return baseUrlParsed.Host
}
func Url(path string, query []Q) string {
return ProjectUrl(path, query, "")
}

View File

@ -361,11 +361,8 @@ func LoadCommonWebsiteData(c *RequestContext) (bool, ResponseData) {
// get project
{
slug := ""
hostParts := strings.SplitN(c.Req.Host, ".", 3)
if len(hostParts) >= 3 {
slug = hostParts[0]
}
hostPrefix := strings.TrimSuffix(c.Req.Host, hmnurl.GetBaseHost())
slug := strings.TrimRight(hostPrefix, ".")
dbProject, err := FetchProjectBySlug(c.Context(), c.Conn, slug)
if err != nil {