Commit 99fe9cf964

99fe9cf9644ed1896bd90f66cf6a12251587d07c

parent: ff4f1a2422

Unsigned

lost+skunk <skunky@ebloid.ru> · 2024-07-08 09:47 UTC

Небольшие изменения в гуе + (возможно) устранённый баг с комментами

Layout: unified · split

app/wrapper.go +21 −8
@@ -131,13 +131,13 @@ func (s skunkyart) GRUser() {
131131 case "group_admins":
132132 var htm strings.Builder
133133 for _, z := range x.ModuleData.GroupAdmins.Results {
134 htm.WriteString(`<p><img src="`)
134 htm.WriteString(`<div class="admin"><img src="`)
135135 htm.WriteString(UrlBuilder("media", "emojitar", z.User.Username, "?type=a"))
136136 htm.WriteString(`"><a href="`)
137137 htm.WriteString(UrlBuilder("group_user", "?type=about&q=", z.User.Username))
138138 htm.WriteString(`">`)
139139 htm.WriteString(z.User.Username)
140 htm.WriteString(`</a></p>`)
140 htm.WriteString(`</a></div>`)
141141 }
142142 group.Admins += htm.String()
143143 }
@@ -158,8 +158,18 @@ func (s skunkyart) GRUser() {
158158 for _, x := range gallery.Content.Gruser.Page.Modules {
159159 if l := len(x.ModuleData.Folders.Results); l != 0 {
160160 var folders strings.Builder
161 folders.WriteString(`<h3 class="folders">Folders: `)
162 for n, x := range x.ModuleData.Folders.Results {
161 folders.WriteString(`<h1 id="folders"><a href="#folder">#</a> Folders</h1><div class="folders"><br>`)
162 for _, x := range x.ModuleData.Folders.Results {
163 folders.WriteString(`<div class="block folder-item">`)
164
165 folders.WriteString(`<a href="`)
166 folders.WriteString(s.ConvertDeviantArtUrlToSkunkyArt(x.Thumb.Url))
167 folders.WriteString(`"><img loading="lazy" src="`)
168 folders.WriteString(s.ParseMedia(x.Thumb.Media))
169 folders.WriteString(`" title="`)
170 folders.WriteString(x.Thumb.Title)
171 folders.WriteString(`"></a><br>`)
172
163173 folders.WriteString(`<a href="?folder=`)
164174 folders.WriteString(strconv.Itoa(x.FolderId))
165175 folders.WriteString("&q=")
@@ -169,11 +179,10 @@ func (s skunkyart) GRUser() {
169179 folders.WriteString(`">`)
170180 folders.WriteString(x.Name)
171181 folders.WriteString(`</a>`)
172 if n+1 < l {
173 folders.WriteString(" | ")
174 }
182
183 folders.WriteString("</div>")
175184 }
176 folders.WriteString("</h3>")
185 folders.WriteString(`</div><h1 id="content"><a href="#content">#</a> Content</h1>`)
177186 group.Gallery.Folders = folders.String()
178187 }
179188
@@ -225,6 +234,10 @@ func (s skunkyart) Deviation(author, postname string) {
225234 post.Tags += tag.String()
226235 }
227236
237 if post.Post.Comments.Total <= 50 {
238 post.Post.Comments.Cursor = ""
239 }
240
228241 post.Comments = s.ParseComments(devianter.CommentsFunc(id, post.Post.Comments.Cursor, s.Page, 1))
229242
230243 s.ExecuteTemplate("html/deviantion.htm", &s)
config.example.json +1 −1
@@ -11,5 +11,5 @@
1111 "templates-dir": "html",
1212 "wixmp-proxy": "http://127.0.0.1:8080",
1313 "proxy": true,
14 "nsfw": false
14 "nsfw": true
1515}
\ No newline at end of file
css/skunky.css +19 −1
@@ -81,7 +81,7 @@ form input, button, select {
8181 border: 3px solid #4d27d6;
8282 transition: 400ms;
8383}
84.block img {
84.block img, .admins .admin img{
8585 width: 100%;
8686}
8787.block p {
@@ -95,3 +95,21 @@ form input, button, select {
9595.ubg img {
9696 width: 20%;
9797}
98.folders {
99 display: flex
100}
101.folder-item {
102 background-color: #060820;
103 border: 3px solid #060820;
104}
105.admins {
106 display: flex
107}
108.admins .admin {
109 margin-left: 1%;
110 background-color: #011522;
111 padding: 3px;
112 word-break: break-all;
113 text-align: center;
114 width: 5%;
115}
\ No newline at end of file
html/gruser.htm +2
@@ -57,7 +57,9 @@
5757
5858 {{if ne .Templates.GroupUser.Admins ""}}
5959 <h3 id="admins"><a href="#admins">#</a> Group admins</h3>
60 <div class="admins">
6061 {{.Templates.GroupUser.Admins}}
62 </div>
6163 {{end}}
6264
6365 {{if ne .Templates.GroupUser.About.Interests ""}}