diff --git a/init/init.go b/init/init.go index cb20eba..562ad69 100644 --- a/init/init.go +++ b/init/init.go @@ -24,7 +24,6 @@ api_url_internal = "https://pixeldrain.com/api" # prefix will be derived from there api_socket_path = "" -website_address = "https://pixeldrain.com" session_cookie_domain = "" resource_dir = "res" diff --git a/webcontroller/opengraph.go b/webcontroller/opengraph.go index dbcfc6f..cd564a8 100644 --- a/webcontroller/opengraph.go +++ b/webcontroller/opengraph.go @@ -9,6 +9,7 @@ import ( ) const defaultThemeColour = "#220735" +const defaultHost = "https://pixeldrain.com" type ogData struct { MetaPropRules []ogProp @@ -78,10 +79,12 @@ func generateOGData(name, filetype, pageurl, fileurl, thumbnailurl, themecolour } func getRequestAddress(r *http.Request) (addr string) { - if r.TLS == nil { - return "http://" + r.Header.Get("Host") + if r.Host == "" { + return defaultHost + } else if r.TLS == nil { + return "http://" + r.Host } else { - return "https://" + r.Header.Get("Host") + return "https://" + r.Host } } diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go index 581dfbe..1fb081c 100644 --- a/webcontroller/web_controller.go +++ b/webcontroller/web_controller.go @@ -23,7 +23,6 @@ type Config struct { APIURLExternal string `toml:"api_url_external"` APIURLInternal string `toml:"api_url_internal"` APISocketPath string `toml:"api_socket_path"` - WebsiteAddress string `toml:"website_address"` SessionCookieDomain string `toml:"session_cookie_domain"` ResourceDir string `toml:"resource_dir"` DebugMode bool `toml:"debug_mode"`