From af0927cf5c9ea49b4c27559589ed4068024f09e5 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:23:23 -0500 Subject: [PATCH 01/11] spelling: consequences Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- keys.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keys.go b/keys.go index 98ff13f..06a443a 100644 --- a/keys.go +++ b/keys.go @@ -52,7 +52,7 @@ func initKeyPaths(app *App) { func generateKey(path string) error { // Check if key file exists if _, err := os.Stat(path); err == nil { - log.Info("%s already exists. rm the file if you understand the consquences.", path) + log.Info("%s already exists. rm the file if you understand the consequences.", path) return nil } else if !os.IsNotExist(err) { log.Error("%s", err) From bc53300e335f93897d5066d5df7afc099db6b031 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:23:24 -0500 Subject: [PATCH 02/11] spelling: dynamic Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- routes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.go b/routes.go index 00b6bd0..b935759 100644 --- a/routes.go +++ b/routes.go @@ -82,7 +82,7 @@ func InitRoutes(apper Apper, r *mux.Router) *mux.Router { configureGenericOauth(handler, write, apper.App()) configureGiteaOauth(handler, write, apper.App()) - // Set up dyamic page handlers + // Set up dynamic page handlers // Handle auth auth := write.PathPrefix("/api/auth/").Subrouter() if apper.App().cfg.App.OpenRegistration { From 680f0d1e2051dcb66fa754c5fa216804be87950b Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:12:25 -0500 Subject: [PATCH 03/11] spelling: github Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d3bc432..9acc89e 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -1,4 +1,4 @@ -name: Build container image, publish as Github-package +name: Build container image, publish as GitHub-package # This workflow uses actions that are not certified by GitHub. # They are provided by a third-party and are governed by From 7feea370ed46820c7a93a641cc0c49a416007388 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:23:24 -0500 Subject: [PATCH 04/11] spelling: highlight Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- templates/include/post-render.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/include/post-render.tmpl b/templates/include/post-render.tmpl index 5b84845..c44e3a7 100644 --- a/templates/include/post-render.tmpl +++ b/templates/include/post-render.tmpl @@ -76,7 +76,7 @@ jss.push(lurl); } } - // Load files in order, higlight on last load + // Load files in order, highlight on last load loadLanguages(jss, () => {highlight(lb)}); } }); From 8834253502f094e00e43e88df69d9f167bc4b443 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:14:51 -0500 Subject: [PATCH 05/11] spelling: into Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- account.go | 2 +- pages.go | 2 +- pages/login.tmpl | 6 +++--- templates/user/admin/view-user.tmpl | 2 +- templates/user/settings.tmpl | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/account.go b/account.go index 91a8ace..ff87e41 100644 --- a/account.go +++ b/account.go @@ -504,7 +504,7 @@ func login(app *App, w http.ResponseWriter, r *http.Request) error { // User has no email set, so check if they haven't added a password, either, // so we can return a more helpful error message. if hasPass, _ := app.db.IsUserPassSet(u.ID); !hasPass { - log.Info("Tried logging in to %s, but no password or email.", signin.Alias) + log.Info("Tried logging into %s, but no password or email.", signin.Alias) return impart.HTTPError{http.StatusPreconditionFailed, "This user never added a password or email address. Please contact us for help."} } } diff --git a/pages.go b/pages.go index 8b3a987..ce37688 100644 --- a/pages.go +++ b/pages.go @@ -75,7 +75,7 @@ func defaultPrivacyPolicy(cfg *config.Config) string { It retains as little data about you as possible, not even requiring an email address to sign up. However, if you _do_ give us your email address, it is stored encrypted in our database. We salt and hash your account's password. -We store log files, or data about what happens on our servers. We also use cookies to keep you logged in to your account. +We store log files, or data about what happens on our servers. We also use cookies to keep you logged into your account. Beyond this, it's important that you trust whoever runs **` + cfg.App.SiteName + `**. Software can only do so much to protect you -- your level of privacy protections will ultimately fall on the humans that run this particular service.` } diff --git a/pages/login.tmpl b/pages/login.tmpl index f0a54eb..0fe29a1 100644 --- a/pages/login.tmpl +++ b/pages/login.tmpl @@ -1,13 +1,13 @@ {{define "head"}}Log in — {{.SiteName}} - - + + {{end}} {{define "content"}}
-

Log in to {{.SiteName}}

+

Log into {{.SiteName}}

{{if .Flashes}}
- +
{{if .Editing}}{{end}}
diff --git a/templates/classic.tmpl b/templates/classic.tmpl index 7032f58..58f82c7 100644 --- a/templates/classic.tmpl +++ b/templates/classic.tmpl @@ -62,7 +62,7 @@
- +
{{if .Editing}}{{end}} diff --git a/templates/pad.tmpl b/templates/pad.tmpl index 555bbb3..eb1afba 100644 --- a/templates/pad.tmpl +++ b/templates/pad.tmpl @@ -57,7 +57,7 @@
- +
{{if .Editing}}{{end}} From af875b4d87caba2f67b04a5fb77dd4d4b45faff8 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:23:25 -0500 Subject: [PATCH 07/11] spelling: message Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- account.go | 2 +- posts.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/account.go b/account.go index ff87e41..89e8d15 100644 --- a/account.go +++ b/account.go @@ -577,7 +577,7 @@ func getVerboseAuthUser(app *App, token string, u *User, verbose bool) *AuthUser } passIsSet, err := app.db.IsUserPassSet(u.ID) if err != nil { - // TODO: correct error meesage + // TODO: correct error message log.Error("Login: Unable to get user collections: %v", err) } diff --git a/posts.go b/posts.go index e95532e..c78036b 100644 --- a/posts.go +++ b/posts.go @@ -1067,7 +1067,7 @@ func pinPost(app *App, w http.ResponseWriter, r *http.Request) error { ppr := PinPostResult{ID: p.ID} if err != nil { ppr.Code = http.StatusInternalServerError - // TODO: set error messsage + // TODO: set error message } else { ppr.Code = http.StatusOK } From 7e5d60043d7a20fe74b1fb45e72978e1bb397645 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:23:26 -0500 Subject: [PATCH 08/11] spelling: miscellaneous Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- templates/include/post-render.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/include/post-render.tmpl b/templates/include/post-render.tmpl index c44e3a7..39bc7f6 100644 --- a/templates/include/post-render.tmpl +++ b/templates/include/post-render.tmpl @@ -1,4 +1,4 @@ - + {{define "collection-meta"}} {{if .Monetization -}} From 0746ec8567976192eb588d8dcd430df9d6ce1595 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:23:26 -0500 Subject: [PATCH 09/11] spelling: modified Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- scripts/upgrade-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade-server.sh b/scripts/upgrade-server.sh index b129943..f010c94 100755 --- a/scripts/upgrade-server.sh +++ b/scripts/upgrade-server.sh @@ -2,7 +2,7 @@ ############################################################################### ## writefreely update script ## ## ## -## WARNING: running this script will overwrite any modifed assets or ## +## WARNING: running this script will overwrite any modified assets or ## ## template files. If you have any custom changes to these files you ## ## should back them up FIRST. ## ## ## From 02fb079a9f8246a2a7c07f2790cdf930117ff887 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:24:07 -0500 Subject: [PATCH 10/11] spelling: optional Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- handle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handle.go b/handle.go index e0600bb..7537b61 100644 --- a/handle.go +++ b/handle.go @@ -262,7 +262,7 @@ func apiAuth(app *App, r *http.Request) (*User, error) { return u, nil } -// optionaAPIAuth is used for endpoints that accept authenticated requests via +// optionalAPIAuth is used for endpoints that accept authenticated requests via // Authorization header or cookie, unlike apiAuth. It returns a different err // in the case where no Authorization header is present. func optionalAPIAuth(app *App, r *http.Request) (*User, error) { From ea81e2c8396796e0229d9c63cacda0002f4cac77 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:23:27 -0500 Subject: [PATCH 11/11] spelling: pattern Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- templates/user/admin/users.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/admin/users.tmpl b/templates/user/admin/users.tmpl index f6b218c..935d445 100644 --- a/templates/user/admin/users.tmpl +++ b/templates/user/admin/users.tmpl @@ -4,7 +4,7 @@
{{template "admin-header" .}} - + {{if .Flashes}}

{{range .Flashes}}{{.}}{{end}}