diff --git a/CHANGELOG.md b/CHANGELOG.md index 16ad037..015e9cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,6 @@ # Changelog This file keeps track of changes in more human-readable fashion -## v1.1.2 -This version contains changes from pull request #2 by Rithas K. -* Real IPs are now logged -* Textarea has been fixed Safari -* Done some minor behind-the-scenes housekeeping ## v1.1.1 This release is mostly a technicality, with a move over to GitHub (`ghcr.io/andrew-71/hibiscus`) for packages due to DockerHub's anti-Russian actions making old "CI/CD" impossible. ## v1.1.0 diff --git a/config.go b/config.go index 1883dd0..d290c2d 100644 --- a/config.go +++ b/config.go @@ -48,7 +48,6 @@ var DefaultConfig = Config{ TelegramToken: "", TelegramChat: "", - TelegramTopic: "", } // String returns text version of modified and mandatory config options diff --git a/info.go b/info.go index 7e1fc65..64ecdad 100644 --- a/info.go +++ b/info.go @@ -15,7 +15,7 @@ type AppInfo struct { // Info contains app information var Info = AppInfo{ - Version: "1.1.2", + Version: "1.1.1", SourceLink: "https://git.a71.su/Andrew71/hibiscus", } diff --git a/public/main.css b/public/main.css index 19250a4..9c48afb 100644 --- a/public/main.css +++ b/public/main.css @@ -25,7 +25,6 @@ --textarea-border-dark: #454545; } -* { box-sizing: border-box; } body { color: var(--text-light); background-color: var(--bg-light); diff --git a/routes.go b/routes.go index 85e4a37..8d16d24 100644 --- a/routes.go +++ b/routes.go @@ -27,21 +27,17 @@ type Entry struct { type formatEntries func([]string) []Entry -// Public contains the static files e.g. CSS, JS -// //go:embed public var Public embed.FS -// Pages contains the HTML templates used by the app -// //go:embed pages var Pages embed.FS -// EmbeddedPage returns contents of a file in Pages while "handling" potential errors -func EmbeddedPage(name string) []byte { +// EmbeddedFile returns a file in Pages while "handling" potential errors +func EmbeddedFile(name string) []byte { data, err := Pages.ReadFile(name) if err != nil { - slog.Error("error reading embedded file", "err", err) + slog.Error("Error embedded file", "err", err) } return data } @@ -58,13 +54,13 @@ var listTemplate = template.Must(template.New("").Funcs(templateFuncs).ParseFS(P // NotFound returns a user-friendly 404 error page func NotFound(w http.ResponseWriter, r *http.Request) { w.WriteHeader(404) - HandleWrite(w.Write(EmbeddedPage("pages/error/404.html"))) + HandleWrite(w.Write(EmbeddedFile("pages/error/404.html"))) } // InternalError returns a user-friendly 500 error page func InternalError(w http.ResponseWriter, r *http.Request) { w.WriteHeader(500) - HandleWrite(w.Write(EmbeddedPage("pages/error/500.html"))) + HandleWrite(w.Write(EmbeddedFile("pages/error/500.html"))) } // GetToday renders HTML page for today's entry diff --git a/serve.go b/serve.go index 064e98a..ab11789 100644 --- a/serve.go +++ b/serve.go @@ -12,7 +12,6 @@ import ( // Serve starts the app's web server func Serve() { r := chi.NewRouter() - r.Use(middleware.RealIP) r.Use(middleware.Logger, middleware.CleanPath, middleware.StripSlashes) r.NotFound(NotFound)