Commit edfc25e18c
edfc25e18c4585b2deed7b7d9531cc3fcecf1d4f
parent: eea656e612
Verified · cmc
cmc <hello@cleberg.net> · 2026-07-15 00:09 UTC
fix: resolve golandci-lint errors
Layout: unified · split
deviantion.go
+9 −6
| @@ -149,12 +149,15 @@ func GetDeviation(id string, user string) (st Post, err Error) { |
| 149 | } |
149 | } |
| 150 | } |
150 | } |
| 151 | |
151 | |
| 152 | json.Unmarshal([]byte(txt), &description) |
152 | if err := json.Unmarshal([]byte(txt), &description); err != nil { |
| 153 | for _, a := range description.Blocks { |
153 | // Handle error appropriately |
| 154 | txt = a.Text |
154 | try(err) // or log/return the error |
| 155 | } |
155 | } |
| 156 | } |
156 | for _, a := range description.Blocks { |
| |
157 | txt = a.Text |
| |
158 | } |
| |
159 | } |
| 157 | st.Description = txt |
160 | st.Description = txt |
| 158 | |
161 | |
| 159 | return |
162 | return |
| 160 | } |
163 | } |
misc.go
+6 −1
| @@ -78,9 +78,14 @@ type Search struct { |
| 78 | ResultsGalleryTemp []Deviation `json:"results"` |
78 | ResultsGalleryTemp []Deviation `json:"results"` |
| 79 | } |
79 | } |
| 80 | |
80 | |
| 81 | func PerformSearch(query string, page int, scope rune, user ...string) (ss Search, err error, daError Error) { |
81 | func PerformSearch(query string, page int, scope rune, user ...string) (ss Search, daError Error, err error) { |
| 82 | var buildurl strings.Builder |
82 | var buildurl strings.Builder |
| 83 | |
83 | |
| |
84 | if user == nil { |
| |
85 | err = errors.New("missing username (last argument)") |
| |
86 | return |
| |
87 | } |
| |
88 | |
| 84 | // о5 построение ссылок. |
89 | // о5 построение ссылок. |
| 85 | switch scope { |
90 | switch scope { |
| 86 | case 'a': // поиск артов по названию |
91 | case 'a': // поиск артов по названию |
user-group.go
+12 −12
| @@ -75,13 +75,13 @@ type Group struct { |
| 75 | } |
75 | } |
| 76 | |
76 | |
| 77 | // подходит как группа, так и пользователь |
77 | // подходит как группа, так и пользователь |
| 78 | func (s Group) Get() (g GRuser, err error, daError Error) { |
78 | func (s Group) Get() (g GRuser, daError Error, err error) { |
| 79 | if s.Name == "" { |
79 | if s.Name == "" { |
| 80 | return g, errors.New("missing Name field"), daError |
80 | return g, daError, errors.New("missing Name field") |
| 81 | } |
81 | } |
| 82 | daError = ujson("dauserprofile/init/about?username="+s.Name, &g) |
82 | daError = ujson("dauserprofile/init/about?username="+s.Name, &g) |
| 83 | |
83 | |
| 84 | return |
84 | return |
| 85 | } |
85 | } |
| 86 | |
86 | |
| 87 | func (s Group) Favourites(page int, all bool, folderid ...int) (g Group, err Error) { |
87 | func (s Group) Favourites(page int, all bool, folderid ...int) (g Group, err Error) { |
| @@ -110,10 +110,10 @@ func (s Group) Favourites(page int, all bool, folderid ...int) (g Group, err Err |
| 110 | } |
110 | } |
| 111 | |
111 | |
| 112 | // гарелея пользователя или группы |
112 | // гарелея пользователя или группы |
| 113 | func (s Group) Gallery(page int, folderid ...int) (g Group, err error, daError Error) { |
113 | func (s Group) Gallery(page int, folderid ...int) (g Group, daError Error, err error) { |
| 114 | if s.Name == "" { |
114 | if s.Name == "" { |
| 115 | return g, errors.New("missing Name field"), daError |
115 | return g, daError, errors.New("missing Name field") |
| 116 | } |
116 | } |
| 117 | |
117 | |
| 118 | var url strings.Builder |
118 | var url strings.Builder |
| 119 | if folderid[0] > 0 { |
119 | if folderid[0] > 0 { |
| @@ -135,8 +135,8 @@ func (s Group) Gallery(page int, folderid ...int) (g Group, err error, daError E |
| 135 | url.WriteString("limit=50") |
135 | url.WriteString("limit=50") |
| 136 | url.WriteString("&with_subfolders=false") |
136 | url.WriteString("&with_subfolders=false") |
| 137 | |
137 | |
| 138 | daError = ujson(url.String(), &g.Content) |
138 | daError = ujson(url.String(), &g.Content) |
| 139 | return |
139 | return |
| 140 | } |
140 | } |
| 141 | |
141 | |
| 142 | type GroupAbout struct { |
142 | type GroupAbout struct { |
util.go
+5 −1
| @@ -94,7 +94,11 @@ func request(uri string, other ...string) reqrt { |
| 94 | r.Err = e |
94 | r.Err = e |
| 95 | return r |
95 | return r |
| 96 | } |
96 | } |
| 97 | defer resp.Body.Close() |
97 | defer func() { |
| |
98 | if err := resp.Body.Close(); err != nil { |
| |
99 | try(err) |
| |
100 | } |
| |
101 | }() |
| 98 | |
102 | |
| 99 | body, e := io.ReadAll(resp.Body) |
103 | body, e := io.ReadAll(resp.Body) |
| 100 | if e != nil { |
104 | if e != nil { |