Commit 0fdc45a668
0fdc45a668d95d603a9013f90392f6bc966c72f9
parent: 6b8e230012
Verified · cmc
cmc <hello@cleberg.net> · 2026-07-15 01:22 UTC
deps: migrate to github.com/zerolabsco/devianter v0.3.1
Repoint the import path from git.macaw.me/skunky/devianter, replacing a
placeholder v0.0.0 require that had no go.sum entry and did not resolve.
v0.3.1 reorders the last two return values of PerformSearch, Group.Get
and Group.Gallery from (..., error, Error) to (..., Error, error);
adapt the call sites. The two types differ, so the compiler enforces
this.
Layout: unified · split
app/api.go
+2 −2
| @@ -5,7 +5,7 @@ import ( |
| 5 | 5 | "math/rand" |
| 6 | 6 | "strings" |
| 7 | 7 | |
| 8 | | "git.macaw.me/skunky/devianter" |
| 8 | "github.com/zerolabsco/devianter" |
| 9 | 9 | ) |
| 10 | 10 | |
| 11 | 11 | type API struct { |
| @@ -63,7 +63,7 @@ func (a API) Random() { |
| 63 | 63 | a.Error("Sorry, butt NSFW on this are disabled, and the instance failed to find a random art without NSFW", 500) |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | | s, err, daErr := devianter.PerformSearch(string(rand.Intn(999)), rand.Intn(30), 'a') |
| 66 | s, daErr, err := devianter.PerformSearch(string(rand.Intn(999)), rand.Intn(30), 'a') |
| 67 | 67 | try(err) |
| 68 | 68 | if daErr.RAW != nil { |
| 69 | 69 | continue |
app/config.go
+1 −1
| @@ -8,7 +8,7 @@ import ( |
| 8 | 8 | "strconv" |
| 9 | 9 | "time" |
| 10 | 10 | |
| 11 | | "git.macaw.me/skunky/devianter" |
| 11 | "github.com/zerolabsco/devianter" |
| 12 | 12 | ) |
| 13 | 13 | |
| 14 | 14 | var Release struct { |
app/parsers.go
+1 −1
| @@ -5,7 +5,7 @@ import ( |
| 5 | 5 | "strconv" |
| 6 | 6 | "strings" |
| 7 | 7 | |
| 8 | | "git.macaw.me/skunky/devianter" |
| 8 | "github.com/zerolabsco/devianter" |
| 9 | 9 | "golang.org/x/net/html" |
| 10 | 10 | ) |
| 11 | 11 | |
app/util.go
+1 −1
| @@ -12,7 +12,7 @@ import ( |
| 12 | 12 | "text/template" |
| 13 | 13 | "time" |
| 14 | 14 | |
| 15 | | "git.macaw.me/skunky/devianter" |
| 15 | "github.com/zerolabsco/devianter" |
| 16 | 16 | "golang.org/x/net/html" |
| 17 | 17 | ) |
| 18 | 18 | |
app/wrapper.go
+5 −5
| @@ -6,7 +6,7 @@ import ( |
| 6 | 6 | "strings" |
| 7 | 7 | "time" |
| 8 | 8 | |
| 9 | | "git.macaw.me/skunky/devianter" |
| 9 | "github.com/zerolabsco/devianter" |
| 10 | 10 | "golang.org/x/net/html" |
| 11 | 11 | ) |
| 12 | 12 | |
| @@ -20,7 +20,7 @@ func (s skunkyart) GRUser() { |
| 20 | 20 | var daError devianter.Error |
| 21 | 21 | g.Name = s.Query |
| 22 | 22 | var err error |
| 23 | | s.Templates.GroupUser.GR, err, daError = g.Get() |
| 23 | s.Templates.GroupUser.GR, daError, err = g.Get() |
| 24 | 24 | try(err) |
| 25 | 25 | if daError.RAW != nil { |
| 26 | 26 | s.Error(daError) |
| @@ -98,7 +98,7 @@ func (s skunkyart) GRUser() { |
| 98 | 98 | if s.Type == 'f' { |
| 99 | 99 | content, daError = g.Favourites(s.Page, all, folderid) |
| 100 | 100 | } else { |
| 101 | | content, err, daError = g.Gallery(s.Page, folderid) |
| 101 | content, daError, err = g.Gallery(s.Page, folderid) |
| 102 | 102 | try(err) |
| 103 | 103 | } |
| 104 | 104 | |
| @@ -267,9 +267,9 @@ func (s skunkyart) Search() { |
| 267 | 267 | ss := &s.Templates.Search |
| 268 | 268 | switch s.Type { |
| 269 | 269 | case 'a', 't': |
| 270 | | ss.Content, err, daError = devianter.PerformSearch(s.Query, s.Page, s.Type) |
| 270 | ss.Content, daError, err = devianter.PerformSearch(s.Query, s.Page, s.Type) |
| 271 | 271 | case 'g', 'f': |
| 272 | | ss.Content, err, daError = devianter.PerformSearch(s.Query, s.Page, s.Type, s.Args.Get("usr")) |
| 272 | ss.Content, daError, err = devianter.PerformSearch(s.Query, s.Page, s.Type, s.Args.Get("usr")) |
| 273 | 273 | case 'r': // скраппер, поскольку девиантартовцы зажопили гостевое API для поиска групп |
| 274 | 274 | var ( |
| 275 | 275 | usernames = make(map[int]string) |
go.mod
+1 −1
| @@ -3,6 +3,6 @@ module skunkyart |
| 3 | 3 | go 1.18 |
| 4 | 4 | |
| 5 | 5 | require ( |
| 6 | | git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133 |
| 6 | github.com/zerolabsco/devianter v0.3.1 |
| 7 | 7 | golang.org/x/net v0.27.0 |
| 8 | 8 | ) |
go.sum
+2 −2
| @@ -1,4 +1,4 @@ |
| 1 | | git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133 h1:ziutYUyDmdbsptR8Lj4lNmZUxfgwGsNbHM1mO9ATph8= |
| 2 | | git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133/go.mod h1:ZLn527xBlnpXrUB1B8z/MhyeiWVK4nPWjyfnhWOE8Is= |
| 1 | github.com/zerolabsco/devianter v0.3.1 h1:QS28ATASgas8IejXpekWU1Z4//1Gr/tuqdl5BRAqItE= |
| 2 | github.com/zerolabsco/devianter v0.3.1/go.mod h1:3su99kASJEhNcJpLMO35Si2qDGTZ3bfKLOK/ymitneM= |
| 3 | 3 | golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= |
| 4 | 4 | golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= |
main.go
+1 −1
| @@ -5,7 +5,7 @@ import ( |
| 5 | 5 | "skunkyart/static" |
| 6 | 6 | "time" |
| 7 | 7 | |
| 8 | | "git.macaw.me/skunky/devianter" |
| 8 | "github.com/zerolabsco/devianter" |
| 9 | 9 | ) |
| 10 | 10 | |
| 11 | 11 | func main() { |