krz/skunky-art

Alternative privacy frontend for DeviantArt. deviantart frontend privacy web https://art.krz.sh

Commit 68248094e8

68248094e89b6af134147668a9add429b9a6fa77

parent: ed031b3530

Unsigned

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

Галерея, папки и группы

Layout: unified · split

app/router.go +26 −15
@@ -13,22 +13,34 @@ const addr string = "0.0.0.0:3003"
1313
1414// роутер
1515func Router() {
16 // расшифровка эндпоинта из урл
17 endpoint := func(url string) (string, string) {
18 if CFG.Base_uri != "" {
19 url = strings.Replace(url, CFG.Base_uri, "/", 1)
16 parsepath := func(path string) map[int]string {
17 parsedpath := make(map[int]string)
18 for x := 0; true; x++ {
19 slash := strings.Index(path, "/") + 1
20 content := path[:slash]
21 path = path[slash:]
22 if slash == 0 {
23 parsedpath[x] = path
24 break
25 }
26 parsedpath[x] = content[:slash-1]
2027 }
28 return parsedpath
29 }
2130
22 end := strings.Index(url[1:], "/")
23 if end == -1 {
24 return url[1:], ""
31 next := func(path map[int]string, from int) (out string) {
32 for x, l := from, len(path)-1; x <= l; x++ {
33 out += path[x]
34 if x != l {
35 out += "/"
36 }
2537 }
26 return url[1 : end+1], url[end+2:]
38 return
2739 }
2840
2941 // функция, что управляет всем
3042 handle := func(w http.ResponseWriter, r *http.Request) {
31 e, url := endpoint(r.URL.Path)
43 path := parsepath(r.URL.Path)
3244 var wr = io.WriteString
3345 open_n_send := func(name string) {
3446 f, e := os.ReadFile(name)
@@ -50,14 +62,13 @@ func Router() {
5062 skunky.Page = p
5163
5264 // пути
53 switch e {
65 switch path[1] {
5466 default:
5567 skunky.ReturnHTTPError(404)
56 case "/", "":
68 case "":
5769 open_n_send("html/index.htm")
5870 case "post":
59 slash := strings.Index(url, "/")
60 skunky.Deviation(url[:slash], url[slash+1:])
71 skunky.Deviation(path[2], path[3])
6172 case "search":
6273 skunky.Search()
6374 case "dd":
@@ -66,12 +77,12 @@ func Router() {
6677 skunky.GRUser()
6778
6879 case "media":
69 skunky.Emojitar(url)
80 skunky.Emojitar(path[2])
7081 case "about":
7182 open_n_send("html/about.htm")
7283 case "gui":
7384 w.Header().Add("content-type", "text/css")
74 open_n_send(url)
85 open_n_send(next(path, 2))
7586 }
7687 }
7788
app/util.go +13
@@ -19,6 +19,15 @@ func (s skunkyart) ExecuteTemplate(file string, data any) {
1919 wr(s.Writer, buf.String())
2020}
2121
22func (s skunkyart) UrlBuilder(strs ...string) string {
23 var str strings.Builder
24 for _, x := range strs {
25 str.WriteString(x)
26 str.WriteString("/")
27 }
28 return str.String()
29}
30
2231func (s skunkyart) ReturnHTTPError(status int) {
2332 s.Writer.WriteHeader(status)
2433
@@ -142,6 +151,10 @@ func (s skunkyart) NavBase(c dlist) string {
142151 list.WriteString("&q=")
143152 list.WriteString(s.Query)
144153 }
154 if f := s.Args.Get("folder"); f != "" {
155 list.WriteString("&folder=")
156 list.WriteString(f)
157 }
145158 list.WriteString(`">`)
146159 list.WriteString(msg)
147160 list.WriteString("</a> ")
app/wraper.go +82 −27
@@ -1,7 +1,6 @@
11package app
22
33import (
4 "fmt"
54 "io"
65 "net/http"
76 "net/url"
@@ -24,6 +23,8 @@ type skunkyart struct {
2423 Templates struct {
2524 GroupUser struct {
2625 GR devianter.GRuser
26 Admins string
27 Group bool
2728 CreationDate string
2829
2930 About struct {
@@ -37,8 +38,9 @@ type skunkyart struct {
3738 }
3839
3940 Gallery struct {
40 Pages int
41 List string
41 Folders string
42 Pages int
43 List string
4244 }
4345 }
4446 Search struct {
@@ -61,19 +63,22 @@ func (s skunkyart) GRUser() {
6163
6264 switch s.Type {
6365 case 'a':
64 if g := group.GR; !g.Owner.Group {
65 for _, x := range g.Gruser.Page.Modules {
66 switch x.Name {
67 case "about":
66 g := group.GR
67 for _, x := range g.Gruser.Page.Modules {
68 switch x.Name {
69 case "about", "group_about":
70 switch g.Owner.Group {
71 case true:
72 var about = &x.ModuleData.GroupAbout
73 group.Group = true
74 group.CreationDate = x.ModuleData.GroupAbout.FoundatedAt.UTC().String()
75 group.About.DescriptionFormatted = ParseDescription(about.Description)
76 case false:
6877 group.About.A = x.ModuleData.About
69 var about = group.About.A
78 var about = &group.About.A
79 group.CreationDate = time.Unix(time.Now().Unix()-x.ModuleData.About.RegDate, 0).UTC().String()
80
7081 group.About.DescriptionFormatted = ParseDescription(about.Description)
71 group.About.Comments = s.ParseComments(devianter.CommentsFunc(
72 strconv.Itoa(group.GR.Gruser.ID),
73 "",
74 s.Page,
75 4,
76 ))
7782
7883 for _, val := range x.ModuleData.About.SocialLinks {
7984 var social strings.Builder
@@ -93,25 +98,76 @@ func (s skunkyart) GRUser() {
9398 interest.WriteString("</b><br>")
9499 group.About.Interests += interest.String()
95100 }
101 }
102 group.About.Comments = s.ParseComments(devianter.CommentsFunc(
103 strconv.Itoa(group.GR.Gruser.ID),
104 "",
105 s.Page,
106 4,
107 ))
96108
97 if rd := x.ModuleData.About.RegDate; rd != 0 {
98 group.CreationDate = time.Unix(time.Now().Unix()-rd, 0).UTC().String()
99 }
100 case "cover_deviation":
101 group.About.BGMeta = x.ModuleData.CoverDeviation.Deviation
102 group.About.BG = devianter.UrlFromMedia(group.About.BGMeta.Media)
109 case "cover_deviation":
110 group.About.BGMeta = x.ModuleData.CoverDeviation.Deviation
111 group.About.BG = devianter.UrlFromMedia(group.About.BGMeta.Media)
112 case "group_admins":
113 var htm strings.Builder
114 for _, z := range x.ModuleData.GroupAdmins.Results {
115 htm.WriteString(`<p><img src="`)
116 htm.WriteString("/media/")
117 htm.WriteString(z.User.Username)
118 htm.WriteString("?type=a")
119 htm.WriteString(`"><a href="`)
120 htm.WriteString("/group_user?type=about&q=")
121 htm.WriteString(z.User.Username)
122 htm.WriteString(`">`)
123 htm.WriteString(z.User.Username)
124 htm.WriteString(`</a></p>`)
103125 }
126 group.Admins += htm.String()
104127 }
105 } else {
106128
107129 }
108130 case 'g':
109 gallery := g.Gallery(s.Page)
110 fmt.Println(gallery)
111 for _, x := range gallery.Content.Gruser.Page.Modules {
112 group.Gallery.List = s.DeviationList(x.ModuleData.Folder.Deviations, dlist{
113 Pages: x.ModuleData.Folder.Pages,
131 folderid, _ := strconv.Atoi(s.Args.Get("folder"))
132 if s.Page == 0 {
133 s.Page++
134 }
135
136 gallery := g.Gallery(s.Page, folderid)
137 if folderid > 0 {
138 group.Gallery.List = s.DeviationList(gallery.Content.Results, dlist{
139 More: gallery.Content.HasMore,
114140 })
141 } else {
142 for _, x := range gallery.Content.Gruser.Page.Modules {
143 if l := len(x.ModuleData.Folders.Results); l != 0 {
144 var folders strings.Builder
145 folders.WriteString(`<h3 class="folders">Folders: `)
146 for n, x := range x.ModuleData.Folders.Results {
147 folders.WriteString(`<a href="?folder=`)
148 folders.WriteString(strconv.Itoa(x.FolderId))
149 folders.WriteString("&q=")
150 folders.WriteString(s.Query)
151 folders.WriteString("&type=")
152 folders.WriteString(string(s.Type))
153 folders.WriteString(`">`)
154 folders.WriteString(x.Name)
155 folders.WriteString(`</a>`)
156 if n+1 < l {
157 folders.WriteString(" | ")
158 }
159 }
160 folders.WriteString("</h3>")
161 group.Gallery.Folders = folders.String()
162 }
163
164 if x.Name == "folder_deviations" {
165 group.Gallery.List = s.DeviationList(x.ModuleData.Folder.Deviations, dlist{
166 Pages: x.ModuleData.Folder.Pages,
167 More: x.ModuleData.Folder.HasMore,
168 })
169 }
170 }
115171 }
116172 default:
117173 s.ReturnHTTPError(400)
@@ -193,7 +249,6 @@ func (s skunkyart) Emojitar(name string) {
193249 ae, e := devianter.AEmedia(name, s.Type)
194250 if e != nil {
195251 s.ReturnHTTPError(404)
196 println(e.Error())
197252 }
198253 wr(s.Writer, ae)
199254 } else {
css/skunky.css +1
@@ -13,6 +13,7 @@ a:hover {
1313}
1414header h1 {
1515 padding-right: 0.2%;
16 padding-left: 0.2%;
1617}
1718header form {
1819 align-self: center;
html/gruser.htm +17 −4
@@ -19,12 +19,12 @@
1919 <input type="gallery" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
2020 <input type="hidden" name="usr" value="{{.Templates.GroupUser.GR.Owner.Username}}">
2121 <select name="type">
22 <option value="gallery">Gallery</option>
2223 <option value="all">All</option>
2324 <option value="tag">Tag</option>
24 <option value="gallery">Gallery</option>
2525 </select>
2626 <button type="submit">Search!</button>
27 </form>
27 </form> <h1>| {{.Templates.GroupUser.GR.Owner.Username}}</h1>
2828 </header>
2929 {{if eq .Type 'a'}}
3030 {{if ne .Templates.GroupUser.About.BG ""}}
@@ -42,12 +42,24 @@
4242 [<span title="UID">{{.Templates.GroupUser.GR.Gruser.ID}}</span>]
4343 [<span title="Registration date">{{.Templates.GroupUser.CreationDate}}</span>]
4444 {{if ne .Templates.GroupUser.GR.Extra.Tag ""}}
45 <i title="User's Tag">"{{.Templates.GroupUser.GR.Extra.Tag}}"</i>{{end}} (<b>{{.Templates.GroupUser.About.A.Country}}</b>)
45 <i title="User's Tag">"{{.Templates.GroupUser.GR.Extra.Tag}}"</i>{{end}} {{if ne .Templates.GroupUser.About.A.Country ""}}
46 (<b>{{.Templates.GroupUser.About.A.Country}}</b>)
47 {{end}}
4648
49 {{if .Templates.GroupUser.Group}}
50 <h3 id="stats"><a href="#stats">#</a> Statistics</h3>
51 <p>Watchers: <b>{{.Templates.GroupUser.GR.Extra.Stats.Watchers}}</b>; Pageviews: <b>{{.Templates.GroupUser.GR.Extra.Stats.Pageviews}}</b></b>
52 {{else}}
4753 <h3 id="stats"><a href="#stats">#</a> Statistics</h3>
4854 <p>Favourites: <b>{{.Templates.GroupUser.GR.Extra.Stats.Favourites}}</b>; Deviations: <b>{{.Templates.GroupUser.GR.Extra.Stats.Deviations}}</b>; Watchers: <b>{{.Templates.GroupUser.GR.Extra.Stats.Watchers}}</b>
4955 <p>Watching: <b>{{.Templates.GroupUser.GR.Extra.Stats.Watching}}</b>; Pageviews: <b>{{.Templates.GroupUser.GR.Extra.Stats.Pageviews}}</b>; Comments Made: <b>{{.Templates.GroupUser.GR.Extra.Stats.CommentsMade}}</b>; Friends: <b>{{.Templates.GroupUser.GR.Extra.Stats.Friends}}</b></p>
50
56 {{end}}
57
58 {{if ne .Templates.GroupUser.Admins ""}}
59 <h3 id="admins"><a href="#admins">#</a> Group admins</h3>
60 {{.Templates.GroupUser.Admins}}
61 {{end}}
62
5163 {{if ne .Templates.GroupUser.About.Interests ""}}
5264 <h3 id="interests"><a href="#interests">#</a> Interests</h3>
5365 {{.Templates.GroupUser.About.Interests}}
@@ -68,6 +80,7 @@
6880 {{.Templates.GroupUser.About.Comments}}
6981 {{end}}
7082 {{else}}
83 {{.Templates.GroupUser.Gallery.Folders}}
7184 {{.Templates.GroupUser.Gallery.List}}
7285 {{end}}
7386 </main>