diff options
| author | Christian Cleberg <[email protected]> | 2026-07-14 20:22:04 -0500 |
|---|---|---|
| committer | Christian Cleberg <[email protected]> | 2026-07-14 20:22:04 -0500 |
| commit | 0fdc45a668d95d603a9013f90392f6bc966c72f9 (patch) | |
| tree | 3c0b5ef28c6c5064b2bc0abe890c15a1933fd129 | |
| parent | 6b8e23001283acb95d10c275155e9cb83b15f598 (diff) | |
| download | skunky-art-0fdc45a668d95d603a9013f90392f6bc966c72f9.tar.gz skunky-art-0fdc45a668d95d603a9013f90392f6bc966c72f9.tar.bz2 skunky-art-0fdc45a668d95d603a9013f90392f6bc966c72f9.zip | |
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.
| -rwxr-xr-x | app/api.go | 4 | ||||
| -rwxr-xr-x | app/config.go | 2 | ||||
| -rwxr-xr-x | app/parsers.go | 2 | ||||
| -rwxr-xr-x | app/util.go | 2 | ||||
| -rwxr-xr-x | app/wrapper.go | 10 | ||||
| -rwxr-xr-x | go.mod | 2 | ||||
| -rwxr-xr-x | go.sum | 4 | ||||
| -rwxr-xr-x | main.go | 2 |
8 files changed, 14 insertions, 14 deletions
@@ -5,7 +5,7 @@ import ( "math/rand" "strings" - "git.macaw.me/skunky/devianter" + "github.com/zerolabsco/devianter" ) type API struct { @@ -63,7 +63,7 @@ func (a API) Random() { a.Error("Sorry, butt NSFW on this are disabled, and the instance failed to find a random art without NSFW", 500) } - s, err, daErr := devianter.PerformSearch(string(rand.Intn(999)), rand.Intn(30), 'a') + s, daErr, err := devianter.PerformSearch(string(rand.Intn(999)), rand.Intn(30), 'a') try(err) if daErr.RAW != nil { continue diff --git a/app/config.go b/app/config.go index 813453c..2d32d19 100755 --- a/app/config.go +++ b/app/config.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "git.macaw.me/skunky/devianter" + "github.com/zerolabsco/devianter" ) var Release struct { diff --git a/app/parsers.go b/app/parsers.go index 192a88d..229b4b5 100755 --- a/app/parsers.go +++ b/app/parsers.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "git.macaw.me/skunky/devianter" + "github.com/zerolabsco/devianter" "golang.org/x/net/html" ) diff --git a/app/util.go b/app/util.go index 6ece2e8..493997b 100755 --- a/app/util.go +++ b/app/util.go @@ -12,7 +12,7 @@ import ( "text/template" "time" - "git.macaw.me/skunky/devianter" + "github.com/zerolabsco/devianter" "golang.org/x/net/html" ) diff --git a/app/wrapper.go b/app/wrapper.go index ef1fb31..0f69159 100755 --- a/app/wrapper.go +++ b/app/wrapper.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "git.macaw.me/skunky/devianter" + "github.com/zerolabsco/devianter" "golang.org/x/net/html" ) @@ -20,7 +20,7 @@ func (s skunkyart) GRUser() { var daError devianter.Error g.Name = s.Query var err error - s.Templates.GroupUser.GR, err, daError = g.Get() + s.Templates.GroupUser.GR, daError, err = g.Get() try(err) if daError.RAW != nil { s.Error(daError) @@ -98,7 +98,7 @@ func (s skunkyart) GRUser() { if s.Type == 'f' { content, daError = g.Favourites(s.Page, all, folderid) } else { - content, err, daError = g.Gallery(s.Page, folderid) + content, daError, err = g.Gallery(s.Page, folderid) try(err) } @@ -267,9 +267,9 @@ func (s skunkyart) Search() { ss := &s.Templates.Search switch s.Type { case 'a', 't': - ss.Content, err, daError = devianter.PerformSearch(s.Query, s.Page, s.Type) + ss.Content, daError, err = devianter.PerformSearch(s.Query, s.Page, s.Type) case 'g', 'f': - ss.Content, err, daError = devianter.PerformSearch(s.Query, s.Page, s.Type, s.Args.Get("usr")) + ss.Content, daError, err = devianter.PerformSearch(s.Query, s.Page, s.Type, s.Args.Get("usr")) case 'r': // скраппер, поскольку девиантартовцы зажопили гостевое API для поиска групп var ( usernames = make(map[int]string) @@ -3,6 +3,6 @@ module skunkyart go 1.18 require ( - git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133 + github.com/zerolabsco/devianter v0.3.1 golang.org/x/net v0.27.0 ) @@ -1,4 +1,4 @@ -git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133 h1:ziutYUyDmdbsptR8Lj4lNmZUxfgwGsNbHM1mO9ATph8= -git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133/go.mod h1:ZLn527xBlnpXrUB1B8z/MhyeiWVK4nPWjyfnhWOE8Is= +github.com/zerolabsco/devianter v0.3.1 h1:QS28ATASgas8IejXpekWU1Z4//1Gr/tuqdl5BRAqItE= +github.com/zerolabsco/devianter v0.3.1/go.mod h1:3su99kASJEhNcJpLMO35Si2qDGTZ3bfKLOK/ymitneM= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= @@ -5,7 +5,7 @@ import ( "skunkyart/static" "time" - "git.macaw.me/skunky/devianter" + "github.com/zerolabsco/devianter" ) func main() { |
