- commit
- 7a72e72
- parent
- 0e5bfd8
- author
- Eric Bower
- date
- 2025-05-24 21:23:05 -0400 EDT
fix: linter autofix
10 files changed,
+44,
-41
1@@ -29,10 +29,8 @@ type RmProject struct {
2 func main() {
3 // to actually commit changes, set to true
4 writeEnv := utils.GetEnv("WRITE", "0")
5- write := false
6- if writeEnv == "1" {
7- write = true
8- }
9+ write := writeEnv == "1"
10+
11 logger := slog.Default()
12
13 picoCfg := shared.NewConfigSite()
+2,
-2
1@@ -92,13 +92,13 @@ func main() {
2 }
3
4 if parsed.PublishAt != nil && !parsed.PublishAt.IsZero() {
5- err = updateDates(tx, post.ID, parsed.MetaData.PublishAt)
6+ err = updateDates(tx, post.ID, parsed.PublishAt)
7 if err != nil {
8 logger.Error(err.Error())
9 continue
10 }
11
12- if !parsed.MetaData.PublishAt.Equal(*post.PublishAt) {
13+ if !parsed.PublishAt.Equal(*post.PublishAt) {
14 datesFixed = append(datesFixed, post.ID)
15 }
16 }
+5,
-4
1@@ -404,7 +404,7 @@ func paymentWebhookHandler(apiConfig *shared.ApiConfig) http.HandlerFunc {
2 if err != nil {
3 logger.Error("error reading request body", "err", err.Error())
4 w.WriteHeader(http.StatusOK)
5- _, _ = w.Write([]byte(fmt.Sprintf("error reading request body %s", err.Error())))
6+ _, _ = fmt.Fprintf(w, "error reading request body %s", err.Error())
7 return
8 }
9
10@@ -413,7 +413,7 @@ func paymentWebhookHandler(apiConfig *shared.ApiConfig) http.HandlerFunc {
11 if err := json.Unmarshal(payload, &event); err != nil {
12 logger.Error("failed to parse webhook body JSON", "err", err.Error())
13 w.WriteHeader(http.StatusOK)
14- _, _ = w.Write([]byte(fmt.Sprintf("failed to parse webhook body JSON %s", err.Error())))
15+ _, _ = fmt.Fprintf(w, "failed to parse webhook body JSON %s", err.Error())
16 return
17 }
18
19@@ -631,7 +631,8 @@ func deserializeCaddyAccessLog(dbpool db.DB, access *AccessLog) (*db.AnalyticsVi
20
21 projectID := ""
22 postID := ""
23- if space == "pgs" { // figure out project ID
24+ switch space {
25+ case "pgs": // figure out project ID
26 project, err := dbpool.FindProjectByName(user.ID, props.ProjectName)
27 if err != nil {
28 return nil, fmt.Errorf(
29@@ -642,7 +643,7 @@ func deserializeCaddyAccessLog(dbpool db.DB, access *AccessLog) (*db.AnalyticsVi
30 )
31 }
32 projectID = project.ID
33- } else if space == "prose" { // figure out post ID
34+ case "prose": // figure out post ID
35 if path == "" || path == "/" {
36 // ignore
37 } else {
+5,
-4
1@@ -29,7 +29,8 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
2 cmd = args[0]
3 }
4
5- if cmd == "help" {
6+ switch cmd {
7+ case "help":
8 fmt.Fprintf(sesh, "Commands: [help, ls, rm, run]\r\n\r\n")
9 writer := tabwriter.NewWriter(sesh, 0, 0, 1, ' ', tabwriter.TabIndent)
10 fmt.Fprintln(writer, "Cmd\tDesc")
11@@ -54,7 +55,7 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
12 "run {filename}", "runs the feed digest post immediately, ignoring last digest time validation",
13 )
14 return writer.Flush()
15- } else if cmd == "ls" {
16+ case "ls":
17 posts, err := dbpool.FindPostsForUser(&db.Pager{Page: 0, Num: 1000}, user.ID, "feeds")
18 if err != nil {
19 fmt.Fprintln(sesh.Stderr(), err)
20@@ -81,7 +82,7 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
21 )
22 }
23 return writer.Flush()
24- } else if cmd == "rm" {
25+ case "rm":
26 filename := args[1]
27 fmt.Fprintf(sesh, "removing digest post %s\r\n", filename)
28 write := false
29@@ -108,7 +109,7 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
30 fmt.Fprintln(sesh, "WARNING: *must* append with `--write` for the changes to persist.")
31 }
32 return err
33- } else if cmd == "run" {
34+ case "run":
35 if len(args) < 2 {
36 err := fmt.Errorf("must provide filename of post to run")
37 fmt.Fprintln(sesh.Stderr(), err)
+9,
-8
1@@ -84,21 +84,22 @@ func itemToTemplate(item *gofeed.Item) *FeedItemTmpl {
2
3 func DigestOptionToTime(lastDigest time.Time, interval string) time.Time {
4 day := 24 * time.Hour
5- if interval == "10min" {
6+ switch interval {
7+ case "10min":
8 return lastDigest.Add(10 * time.Minute)
9- } else if interval == "1hour" {
10+ case "1hour":
11 return lastDigest.Add(1 * time.Hour)
12- } else if interval == "6hour" {
13+ case "6hour":
14 return lastDigest.Add(6 * time.Hour)
15- } else if interval == "12hour" {
16+ case "12hour":
17 return lastDigest.Add(12 * time.Hour)
18- } else if interval == "1day" || interval == "" {
19+ case "1day", "":
20 return lastDigest.Add(1 * day)
21- } else if interval == "7day" {
22+ case "7day":
23 return lastDigest.Add(7 * day)
24- } else if interval == "30day" {
25+ case "30day":
26 return lastDigest.Add(30 * day)
27- } else {
28+ default:
29 return lastDigest
30 }
31 }
+1,
-1
1@@ -47,7 +47,7 @@ func (p *FileHooks) FileMeta(s *pssh.SSHServerConnSession, data *filehandlers.Po
2 // we want the slug to be the filename for pastes
3 data.Slug = data.Filename
4
5- if data.Post.ExpiresAt == nil || data.Post.ExpiresAt.IsZero() {
6+ if data.ExpiresAt == nil || data.ExpiresAt.IsZero() {
7 // mark posts for deletion a X days after creation
8 expiresAt := time.Now().AddDate(0, 0, DEFAULT_EXPIRES_AT)
9 data.ExpiresAt = &expiresAt
+17,
-15
1@@ -97,24 +97,25 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
2
3 cmd := strings.TrimSpace(args[0])
4 if len(args) == 1 {
5- if cmd == "help" {
6+ switch cmd {
7+ case "help":
8 opts.help()
9 return nil
10- } else if cmd == "stats" {
11+ case "stats":
12 err := opts.stats(cfg.MaxSize)
13 opts.bail(err)
14 return err
15- } else if cmd == "ls" {
16+ case "ls":
17 err := opts.ls()
18 opts.bail(err)
19 return err
20- } else if cmd == "cache-all" {
21+ case "cache-all":
22 opts.Write = true
23 err := opts.cacheAll()
24 opts.notice()
25 opts.bail(err)
26 return err
27- } else {
28+ default:
29 return next(sesh)
30 }
31 }
32@@ -129,11 +130,12 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
33 "cmdArgs", cmdArgs,
34 )
35
36- if cmd == "fzf" {
37+ switch cmd {
38+ case "fzf":
39 err := opts.fzf(projectName)
40 opts.bail(err)
41 return err
42- } else if cmd == "link" {
43+ case "link":
44 linkCmd, write := flagSet("link", sesh)
45 linkTo := linkCmd.String("to", "", "symbolic link to this project")
46 if !flagCheck(linkCmd, projectName, cmdArgs) {
47@@ -155,7 +157,7 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
48 opts.bail(err)
49 }
50 return err
51- } else if cmd == "unlink" {
52+ case "unlink":
53 unlinkCmd, write := flagSet("unlink", sesh)
54 if !flagCheck(unlinkCmd, projectName, cmdArgs) {
55 return nil
56@@ -166,11 +168,11 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
57 opts.notice()
58 opts.bail(err)
59 return err
60- } else if cmd == "depends" {
61+ case "depends":
62 err := opts.depends(projectName)
63 opts.bail(err)
64 return err
65- } else if cmd == "retain" {
66+ case "retain":
67 retainCmd, write := flagSet("retain", sesh)
68 retainNum := retainCmd.Int("n", 3, "latest number of projects to keep")
69 if !flagCheck(retainCmd, projectName, cmdArgs) {
70@@ -182,7 +184,7 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
71 opts.notice()
72 opts.bail(err)
73 return err
74- } else if cmd == "prune" {
75+ case "prune":
76 pruneCmd, write := flagSet("prune", sesh)
77 if !flagCheck(pruneCmd, projectName, cmdArgs) {
78 return nil
79@@ -193,7 +195,7 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
80 opts.notice()
81 opts.bail(err)
82 return err
83- } else if cmd == "rm" {
84+ case "rm":
85 rmCmd, write := flagSet("rm", sesh)
86 if !flagCheck(rmCmd, projectName, cmdArgs) {
87 return nil
88@@ -204,7 +206,7 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
89 opts.notice()
90 opts.bail(err)
91 return err
92- } else if cmd == "cache" {
93+ case "cache":
94 cacheCmd, write := flagSet("cache", sesh)
95 if !flagCheck(cacheCmd, projectName, cmdArgs) {
96 return nil
97@@ -215,7 +217,7 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
98 opts.notice()
99 opts.bail(err)
100 return err
101- } else if cmd == "acl" {
102+ case "acl":
103 aclCmd, write := flagSet("acl", sesh)
104 aclType := aclCmd.String("type", "", "access type: public, pico, pubkeys")
105 var acls arrayFlags
106@@ -242,7 +244,7 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
107 opts.notice()
108 opts.bail(err)
109 return err
110- } else {
111+ default:
112 return next(sesh)
113 }
114 }
+1,
-1
1@@ -443,7 +443,7 @@ func StartApiServer() {
2
3 go func() {
4 for {
5- _, err := fmt.Fprintf(pingSession, fmt.Sprintf("%s: pipe-web ping\n", time.Now().UTC().Format(time.RFC3339)))
6+ _, err := fmt.Fprint(pingSession, "%s", fmt.Sprintf("%s: pipe-web ping\n", time.Now().UTC().Format(time.RFC3339)))
7 if err != nil {
8 logger.Error("pipe ping error", "err", err.Error())
9 }
+1,
-1
1@@ -51,7 +51,7 @@ func Middleware(writeHandler utils.CopyFromClientHandler, ext string) pssh.SSHSe
2 }
3
4 if result != "" {
5- _, err := fmt.Fprintf(session, fmt.Sprintf("%s\r\n", result))
6+ _, err := fmt.Fprint(session, "%s\r\n", result)
7 if err != nil {
8 utils.ErrorHandler(session, err)
9 }
+1,
-1
1@@ -157,7 +157,7 @@ func (h *handler) Remove(willReceive []*rsyncutils.ReceiverFile) error {
2
3 for _, file := range toDelete {
4 errs = append(errs, h.writeHandler.Delete(h.session, &utils.FileEntry{Filepath: path.Join("/", h.root, file)}))
5- _, err = fmt.Fprintf(h.session.Stderr(), fmt.Sprintf("deleting %s\r\n", file))
6+ _, err = fmt.Fprint(h.session.Stderr(), "deleting %s\r\n", file)
7 errs = append(errs, err)
8 }
9