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() {
131 case "group_admins": 131 case "group_admins":
132 var htm strings.Builder 132 var htm strings.Builder
133 for _, z := range x.ModuleData.GroupAdmins.Results { 133 for _, z := range x.ModuleData.GroupAdmins.Results {
134 htm.WriteString(`<p><img src="`) 134 htm.WriteString(`<div class="admin"><img src="`)
135 htm.WriteString(UrlBuilder("media", "emojitar", z.User.Username, "?type=a")) 135 htm.WriteString(UrlBuilder("media", "emojitar", z.User.Username, "?type=a"))
136 htm.WriteString(`"><a href="`) 136 htm.WriteString(`"><a href="`)
137 htm.WriteString(UrlBuilder("group_user", "?type=about&q=", z.User.Username)) 137 htm.WriteString(UrlBuilder("group_user", "?type=about&q=", z.User.Username))
138 htm.WriteString(`">`) 138 htm.WriteString(`">`)
139 htm.WriteString(z.User.Username) 139 htm.WriteString(z.User.Username)
140 htm.WriteString(`</a></p>`) 140 htm.WriteString(`</a></div>`)
141 } 141 }
142 group.Admins += htm.String() 142 group.Admins += htm.String()
143 } 143 }
@@ -158,8 +158,18 @@ func (s skunkyart) GRUser() {
158 for _, x := range gallery.Content.Gruser.Page.Modules { 158 for _, x := range gallery.Content.Gruser.Page.Modules {
159 if l := len(x.ModuleData.Folders.Results); l != 0 { 159 if l := len(x.ModuleData.Folders.Results); l != 0 {
160 var folders strings.Builder 160 var folders strings.Builder
161 folders.WriteString(`<h3 class="folders">Folders: `) 161 folders.WriteString(`<h1 id="folders"><a href="#folder">#</a> Folders</h1><div class="folders"><br>`)
162 for n, x := range x.ModuleData.Folders.Results { 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
163 folders.WriteString(`<a href="?folder=`) 173 folders.WriteString(`<a href="?folder=`)
164 folders.WriteString(strconv.Itoa(x.FolderId)) 174 folders.WriteString(strconv.Itoa(x.FolderId))
165 folders.WriteString("&q=") 175 folders.WriteString("&q=")
@@ -169,11 +179,10 @@ func (s skunkyart) GRUser() {
169 folders.WriteString(`">`) 179 folders.WriteString(`">`)
170 folders.WriteString(x.Name) 180 folders.WriteString(x.Name)
171 folders.WriteString(`</a>`) 181 folders.WriteString(`</a>`)
172 if n+1 < l { 182
173 folders.WriteString(" | ") 183 folders.WriteString("</div>")
174 }
175 } 184 }
176 folders.WriteString("</h3>") 185 folders.WriteString(`</div><h1 id="content"><a href="#content">#</a> Content</h1>`)
177 group.Gallery.Folders = folders.String() 186 group.Gallery.Folders = folders.String()
178 } 187 }
179 188
@@ -225,6 +234,10 @@ func (s skunkyart) Deviation(author, postname string) {
225 post.Tags += tag.String() 234 post.Tags += tag.String()
226 } 235 }
227 236
237 if post.Post.Comments.Total <= 50 {
238 post.Post.Comments.Cursor = ""
239 }
240
228 post.Comments = s.ParseComments(devianter.CommentsFunc(id, post.Post.Comments.Cursor, s.Page, 1)) 241 post.Comments = s.ParseComments(devianter.CommentsFunc(id, post.Post.Comments.Cursor, s.Page, 1))
229 242
230 s.ExecuteTemplate("html/deviantion.htm", &s) 243 s.ExecuteTemplate("html/deviantion.htm", &s)
config.example.json +1 −1
@@ -11,5 +11,5 @@
11 "templates-dir": "html", 11 "templates-dir": "html",
12 "wixmp-proxy": "http://127.0.0.1:8080", 12 "wixmp-proxy": "http://127.0.0.1:8080",
13 "proxy": true, 13 "proxy": true,
14 "nsfw": false 14 "nsfw": true
15}\ No newline at end of file 15}\ No newline at end of file
css/skunky.css +19 −1
@@ -81,7 +81,7 @@ form input, button, select {
81 border: 3px solid #4d27d6; 81 border: 3px solid #4d27d6;
82 transition: 400ms; 82 transition: 400ms;
83} 83}
84.block img { 84.block img, .admins .admin img{
85 width: 100%; 85 width: 100%;
86} 86}
87.block p { 87.block p {
@@ -95,3 +95,21 @@ form input, button, select {
95.ubg img { 95.ubg img {
96 width: 20%; 96 width: 20%;
97} 97}
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 @@
57 57
58 {{if ne .Templates.GroupUser.Admins ""}} 58 {{if ne .Templates.GroupUser.Admins ""}}
59 <h3 id="admins"><a href="#admins">#</a> Group admins</h3> 59 <h3 id="admins"><a href="#admins">#</a> Group admins</h3>
60 <div class="admins">
60 {{.Templates.GroupUser.Admins}} 61 {{.Templates.GroupUser.Admins}}
62 </div>
61 {{end}} 63 {{end}}
62 64
63 {{if ne .Templates.GroupUser.About.Interests ""}} 65 {{if ne .Templates.GroupUser.About.Interests ""}}