diff --git a/core/config/config.go b/core/config/config.go index bc8924e..90e2d29 100644 --- a/core/config/config.go +++ b/core/config/config.go @@ -21,7 +21,6 @@ type ServerConfig struct { Port string UnixSocket string - BaseURL string UserAgent string AcceptLanguage string @@ -65,9 +64,6 @@ func (s *ServerConfig) InitializeConfig() error { return errors.New("Either PIXIVFE_PORT or PIXIVFE_UNIXSOCKET has to be set.") } - // Not required - s.SetBaseURL(os.Getenv("PIXIVFE_BASEURL")) - userAgent, hasUserAgent := os.LookupEnv("PIXIVFE_USERAGENT") if !hasUserAgent { userAgent = "Mozilla/5.0" @@ -91,11 +87,6 @@ func (s *ServerConfig) SetToken(v string) { log.Printf("Set token to: %s\n", v) } -func (s *ServerConfig) SetBaseURL(v string) { - s.BaseURL = v - log.Printf("Set base URL to: %s\n", v) -} - func (s *ServerConfig) SetProxyServer(v string) { s.ProxyServer = v log.Printf("Set image proxy server to: %s\n", v) diff --git a/pages/about.go b/pages/about.go index f765cb4..89a1786 100644 --- a/pages/about.go +++ b/pages/about.go @@ -8,7 +8,6 @@ import ( func AboutPage(c *fiber.Ctx) error { info := fiber.Map{ "Time": core.GlobalServerConfig.StartingTime, - "BaseURL": core.GlobalServerConfig.BaseURL, "Version": core.GlobalServerConfig.Version, "ImageProxy": core.GlobalServerConfig.ProxyServer, "AcceptLanguage": core.GlobalServerConfig.AcceptLanguage, diff --git a/run.sh b/run.sh index 904cc48..7c94142 100644 --- a/run.sh +++ b/run.sh @@ -5,7 +5,6 @@ # Visit https://codeberg.org/VnPower/PixivFE/wiki/Environment-variables for more details export PIXIVFE_TOKEN=token_123456 -export PIXIVFE_BASEURL=pixivfe.example.org export PIXIVFE_IMAGEPROXY=pximg.cocomi.cf # export PIXIVFE_UNIXSOCKET=/srv/http/pages/pixivfe export PIXIVFE_PORT=8282 diff --git a/views/pages/about.jet.html b/views/pages/about.jet.html index 162a2d7..bdf5299 100644 --- a/views/pages/about.jet.html +++ b/views/pages/about.jet.html @@ -9,12 +9,6 @@ Started PixivFE (UTC): {{ Time }}
The date when PixivFE started on this server -
  • - Base URL: {{ if isset(BaseURL) and !BaseURL == "localhost" }} {{ - BaseURL }}
    - Meta tags are available for embeds {{ else }} Not set
    - Meta tags are not available, embeds may not work {{ end }} -
  • Default image proxy server: {{ ImageProxy }}
    The default image proxy server that was set on this server, used to proxy images from