!6 · krz/skunky-art

.gitbay/ci.yml added +19

@@ -0,0 +1,19 @@
	1	# gitbay CI. One build per push per job; each step runs with `sh -c` and the
	2	# job stops at the first failure. The image is the runner's default, named
	3	# here so a bump is a deliberate change.
	4	jobs:
	5	build:
	6	image: localhost/gitbay-ci:2
	7	steps:
	8	- go build ./...
	9	- go vet ./...
	10	test:
	11	image: localhost/gitbay-ci:2
	12	steps:
	13	- go test ./... -count=1 -race -timeout 10m
	14	# Pinned, and run through `go run` so the image needs no linter of its own.
	15	# The first run on a runner compiles it; later runs hit the module cache.
	16	lint:
	17	image: localhost/gitbay-ci:2
	18	steps:
	19	- go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2 run ./...

.mailmap deleted −4

	@@ -1,4 +0,0 @@
1	lost+skunk <skunky@ebloid.ru> <skunky@macaw.me>
2	lost+skunk <skunky@ebloid.ru> <me@lost-skunk.cc>
3	lost+skunk <skunky@ebloid.ru> <skunky@noreply.git.macaw.me>
4	lost+skunk <skunky@ebloid.ru> skunky <skunky@ebloid.ru>

app/i18n.go +1 −1

	@@ -87,7 +87,7 @@ func ResolveLang(acceptLanguage string) string {
87	return DefaultLang	87	return DefaultLang
88	}	88	}
89		89
90	for _, part := range strings.Split(acceptLanguage, ",") {	90	for part := range strings.SplitSeq(acceptLanguage, ",") {
91	tag := strings.TrimSpace(part)	91	tag := strings.TrimSpace(part)
92	if i := strings.Index(tag, ";"); i >= 0 {	92	if i := strings.Index(tag, ";"); i >= 0 {
93	tag = tag[:i]	93	tag = tag[:i]

app/i18n_test.go +1 −1

	@@ -27,7 +27,7 @@ func TestEnglishCatalogueCoversEveryKeyTheTemplatesUse(t *testing.T) {
27	}	27	}
28		28
29	for _, f := range files {	29	for _, f := range files {
30	src, err := os.ReadFile(f)	30	src, err := os.ReadFile(f) //nolint:gosec // G304: the test reads the repository's own template files
31	if err != nil {	31	if err != nil {
32	t.Fatalf("read %s: %v", f, err)	32	t.Fatalf("read %s: %v", f, err)
33	}	33	}

app/parsers.go +3 −3

 	return cmmts.String()
 }
-// DeviationList renders devs as an HTML grid, or as an Atom feed when the
-// request asked for one and allowAtom permits it. NSFW entries are dropped
-// unless the instance allows them. Passing content adds a navigation bar.
 // VisibleDeviation reports whether a deviation may be shown by this instance.
 //
 // Both the HTML listing and the JSON API ask this, deliberately: an API that
 	return !d.NSFW || CFG.Nsfw
 }
+// DeviationList renders devs as an HTML grid, or as an Atom feed when the
+// request asked for one and allowAtom permits it. NSFW entries are dropped
+// unless the instance allows them. Passing content adds a navigation bar.
 func (s skunkyart) DeviationList(devs []devianter.Deviation, allowAtom bool, content ...DeviationList) string {
 	if s.Atom && s.Page > 1 {
 		s.ReturnHTTPError(400)

app/stat-freebsd.go −1

app/stat.go −1

app/util.go +1 −4

 	// i reached 1, so page one rendered no numbers at all. With nothing before it
 	// to link back to and no further page to link on, the whole panel came out as
 	// a bare <br>.
-	last := c.Pages
+	last := max(c.Pages, p)
-	if p > last {
-		last = p
-	}
 	for i, x := p-6, 0; (i <= last && i <= p+6) && x < 12; i++ {
 		if i > 0 {

Add gitbay CI: build, test, lint !6