krz/skunky-art

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

Commit 1464584264

14645842643c4e5fa542def715ac1629e182388c

parent: 2f8c35ba32

Unsigned

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

instance list update

Layout: unified · split

INSTANCES.md +2 −2
@@ -3,5 +3,5 @@
33|[skunky.ebloid.ru](https://skunky.ebloid.ru/art)|[Yes](http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art)|No|No| No | No | No | Russia |
44|[clovius.club](https://skunky.clovius.club)|No|No|No| Yes | Yes | No | Sweden |
55|[bloat.cat](https://skunky.bloat.cat)|No|No|No| Yes | Yes | No | Germany |
6|[frontendfriendly.xyz](https://skunkyart.frontendfriendly.xyz)|No|No|No| Yes | Yes | No | Finland |
7|[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | US |
\ No newline at end of file
6|[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | Germany |
7|[art.bloat.cat](https://art.bloat.cat)|No|No|No| Yes | Yes | No | Germany |
TODO.md +2 −2
@@ -13,9 +13,9 @@
1313* **Реализовать отображение контента, отличного от картинок (видео, аудио, etc)**
1414* Исправить баг с эмоджи, когда некоторые кастомные эмоции могут не отображаться
1515* ~~Добавить аргумент &filename, который будет выдавать файл с нормально выглядещем именем~~ ✔️
16* ~~Улучшить систему кеширования: добавить рейтинг для удаления и копирование изображений в ОЗУ~~
16* ~~Улучшить систему кеширования: добавить рейтинг для удаления и копирование изображений в ОЗУ~~ BUG: почему-то всё переодически встаёт раком
1717# v1.4
1818* Реализовать API
1919* Реализовать темы
2020* Перейти на арены в кеше
21* Реализовать многоязычный интерфейс
\ No newline at end of file
21* Реализовать многоязычный интерфейс
app/api.go added +34
@@ -0,0 +1,34 @@
1package app
2
3import (
4 "math/rand"
5 "strings"
6
7 "git.macaw.me/skunky/devianter"
8)
9
10type API struct {
11 skunkyartLink *skunkyart
12}
13
14func (a API) sendMedia(d *devianter.Deviation) {
15 mediaUrl, name := devianter.UrlFromMedia(d.Media)
16
17 var filename strings.Builder
18 filename.WriteString(`filename="`)
19 filename.WriteString(name)
20 filename.WriteString(`"`)
21 a.skunkyartLink.Writer.Header().Add("Content-Disposition", filename.String())
22
23 if len(mediaUrl) != 0 {
24 mediaUrl = mediaUrl[21:]
25 dot := strings.Index(mediaUrl, ".")
26 a.skunkyartLink.DownloadAndSendMedia(mediaUrl[:dot], mediaUrl[dot+11:])
27 }
28}
29
30func (a API) Random() {
31 s, err := devianter.PerformSearch(string(rand.Intn(999)), rand.Intn(30), 'a')
32 try(err)
33 a.sendMedia(&s.Results[rand.Intn(len(s.Results))])
34}
app/cache.go +17 −14
@@ -26,9 +26,11 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) {
2626 url.WriteString(subdomain)
2727 url.WriteString(".wixmp.com/")
2828 url.WriteString(path)
29 url.WriteString("?token=")
30 url.WriteString(s.Args.Get("token"))
31
29 if t := s.Args.Get("token"); t != "" {
30 url.WriteString("?token=")
31 url.WriteString(t)
32 }
33
3234 var response []byte
3335
3436 switch {
@@ -40,17 +42,18 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) {
4042 if tempFS[fileName] == nil {
4143 tempFS[fileName] = &file{}
4244 }
43 f := *tempFS[fileName]
4445 mx.Unlock()
4546
46 if f.Content != nil {
47 f.Score += 2
47 if tempFS[fileName].Content != nil {
48 response = tempFS[fileName].Content
49 tempFS[fileName].Score += 2
50 break
4851 } else {
4952 file, err := os.Open(filePath)
5053 if err != nil {
5154 if dwnld := Download(url.String()); dwnld.Status == 200 && dwnld.Headers["Content-Type"][0][:5] == "image" {
52 f.Content = dwnld.Body
53 try(os.WriteFile(filePath, f.Content, 0700))
55 response = dwnld.Body
56 try(os.WriteFile(filePath, response, 0700))
5457 } else {
5558 s.ReturnHTTPError(dwnld.Status)
5659 return
@@ -58,11 +61,16 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) {
5861 } else {
5962 file, e := io.ReadAll(file)
6063 try(e)
61 f.Content = file
64 response = file
6265 }
6366
6467 go func() {
6568 defer restore()
69
70 mx.RLock()
71 tempFS[fileName].Content = response
72 mx.RUnlock()
73
6674 for {
6775 time.Sleep(1 * time.Minute)
6876
@@ -77,11 +85,6 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) {
7785 }
7886 }()
7987 }
80
81 mx.Lock()
82 tempFS[fileName] = &f
83 mx.Unlock()
84 response = f.Content
8588 case CFG.Proxy:
8689 dwnld := Download(url.String())
8790 if dwnld.Status != 200 {
app/parsers.go +4 −2
@@ -82,8 +82,9 @@ func (s skunkyart) DeviationList(devs []devianter.Deviation, allowAtom bool, con
8282
8383 for i, l := 0, len(devs); i < l; i++ {
8484 data := &devs[i]
85 if preview, fullview := ParseMedia(data.Media, data.Title, 320), ParseMedia(data.Media, data.Title); !(data.NSFW && !CFG.Nsfw) {
85 if preview, fullview := ParseMedia(data.Media, 320), ParseMedia(data.Media); !(data.NSFW && !CFG.Nsfw) {
8686 if allowAtom && s.Atom {
87 s.Writer.Header().Add("Content-type", "application/atom+xml")
8788 id := strconv.Itoa(data.ID)
8889 listContent.WriteString(`<entry><author><name>`)
8990 listContent.WriteString(data.Author.Username)
@@ -183,6 +184,7 @@ type text struct {
183184 To int
184185}
185186
187// переписать весь этот пиздец нахуй
186188func ParseDescription(dscr devianter.Text) string {
187189 var parsedDescription strings.Builder
188190 TagBuilder := func(content string, tags ...string) string {
@@ -286,7 +288,7 @@ func ParseDescription(dscr devianter.Text) string {
286288 parsedDescription.WriteString(`<a href="`)
287289 parsedDescription.WriteString(ConvertDeviantArtUrlToSkunkyArt(d.Url))
288290 parsedDescription.WriteString(`"><img width="50%" src="`)
289 parsedDescription.WriteString(ParseMedia(d.Media, d.Title))
291 parsedDescription.WriteString(ParseMedia(d.Media))
290292 parsedDescription.WriteString(`" title="`)
291293 parsedDescription.WriteString(d.Author.Username)
292294 parsedDescription.WriteString(" - ")
app/router.go +9 −1
@@ -83,13 +83,15 @@ func Router() {
8383 }
8484
8585 skunky.Endpoint = path[1]
86 skunky.API.skunkyartLink = &skunky
8687
8788 // пути
8889 switch skunky.Endpoint {
8990 default:
9091 skunky.ReturnHTTPError(404)
92
9193 case "":
92 w.Write(open("html/index.htm"))
94 skunky.ExecuteTemplate("index.htm", "html", &CFG.URI)
9395 case "post":
9496 skunky.Deviation(path[2], path[3])
9597 case "search":
@@ -120,6 +122,12 @@ func Router() {
120122 w.Write(open("css/skunky.css"))
121123 case "favicon.ico":
122124 w.Write(open("images/logo.png"))
125
126 case "api":
127 switch path[2] {
128 case "random":
129 skunky.API.Random()
130 }
123131 }
124132 }
125133
app/util.go +5 −4
@@ -63,6 +63,8 @@ type skunkyart struct {
6363 BasePath, Endpoint string
6464 Query, QueryRaw string
6565
66 API API
67
6668 Templates struct {
6769 About struct {
6870 Proxy bool
@@ -182,13 +184,12 @@ func Download(urlString string) (d Downloaded) {
182184}
183185
184186/* PARSING HELPERS */
185func ParseMedia(media devianter.Media, filename string, thumb ...int) string {
186 mediaUrl := devianter.UrlFromMedia(media, thumb...)
187func ParseMedia(media devianter.Media, thumb ...int) string {
188 mediaUrl, filename := devianter.UrlFromMedia(media, thumb...)
187189 if len(mediaUrl) != 0 && CFG.Proxy {
188190 mediaUrl = mediaUrl[21:]
189191 dot := strings.Index(mediaUrl, ".")
190
191 return UrlBuilder("media", "file", mediaUrl[:dot], mediaUrl[dot+11:], "&filename=", url.QueryEscape(filename))
192 return UrlBuilder("media", "file", mediaUrl[:dot], mediaUrl[dot+11:], "&filename=", filename)
192193 }
193194 return mediaUrl
194195}
app/wrapper.go +3 −3
@@ -74,7 +74,7 @@ func (s skunkyart) GRUser() {
7474 case "cover_deviation":
7575 group.About.BGMeta = x.ModuleData.CoverDeviation.Deviation
7676 group.About.BGMeta.Url = ConvertDeviantArtUrlToSkunkyArt(group.About.BGMeta.Url)
77 group.About.BG = ParseMedia(group.About.BGMeta.Media, group.About.BGMeta.Title)
77 group.About.BG = ParseMedia(group.About.BGMeta.Media)
7878 case "group_admins":
7979 var htm strings.Builder
8080 for _, z := range x.ModuleData.GroupAdmins.Results {
@@ -122,7 +122,7 @@ func (s skunkyart) GRUser() {
122122 folders.WriteString(`<a href="`)
123123 folders.WriteString(ConvertDeviantArtUrlToSkunkyArt(x.Thumb.Url))
124124 folders.WriteString(`"><img loading="lazy" src="`)
125 folders.WriteString(ParseMedia(x.Thumb.Media, x.Thumb.Title))
125 folders.WriteString(ParseMedia(x.Thumb.Media))
126126 folders.WriteString(`" title="`)
127127 folders.WriteString(x.Thumb.Title)
128128 folders.WriteString(`"></a>`)
@@ -185,7 +185,7 @@ func (s skunkyart) Deviation(author, postname string) {
185185 }
186186 // время публикации
187187 post.StringTime = post.Post.Deviation.PublishedTime.UTC().String()
188 post.Post.IMG = ParseMedia(post.Post.Deviation.Media, post.Post.Deviation.Title)
188 post.Post.IMG = ParseMedia(post.Post.Deviation.Media)
189189 for _, x := range post.Post.Deviation.Extended.RelatedContent {
190190 if len(x.Deviations) != 0 {
191191 post.Related += s.DeviationList(x.Deviations, false)
config.example.json +2 −2
@@ -1,6 +1,6 @@
11{
2 "listen": "0:3003",
3 "uri": "/",
2 "listen": "0.0.0.0:3003",
3 "uri": "/huy/",
44 "cache": {
55 "enabled": true,
66 "path": "cache",
go.mod +2 −2
@@ -1,8 +1,8 @@
11module skunkyart
22
3go 1.22.3
3go 1.18
44
5replace git.macaw.me/skunky/devianter v0.2.5 => /home/skunk/projects/devianter
5// replace git.macaw.me/skunky/devianter v0.2.5 => /home/skunk/projects/devianter
66require (
77 git.macaw.me/skunky/devianter v0.2.5
88 golang.org/x/net v0.27.0
instances.json +7 −7
@@ -35,10 +35,10 @@
3535 }
3636 },
3737 {
38 "title": "frontendfriendly.xyz",
39 "country": "Finland",
38 "title": "lumaeris.com",
39 "country": "Germany",
4040 "urls": {
41 "clearnet": "https://skunkyart.frontendfriendly.xyz"
41 "clearnet": "https://skunkyart.lumaeris.com"
4242 },
4343 "settings": {
4444 "nsfw": true,
@@ -46,10 +46,10 @@
4646 }
4747 },
4848 {
49 "title": "lumaeris.com",
50 "country": "US",
49 "title": "art.bloat.cat",
50 "country": "Germany",
5151 "urls": {
52 "clearnet": "https://skunkyart.lumaeris.com"
52 "clearnet": "https://art.bloat.cat"
5353 },
5454 "settings": {
5555 "nsfw": true,
@@ -57,4 +57,4 @@
5757 }
5858 }
5959 ]
60}
\ No newline at end of file
60}
static/html/index.htm +4 −4
@@ -2,12 +2,12 @@
22<html>
33 <head>
44 <title>SkunkyArt</title>
5 <link rel="stylesheet" href="stylesheet"/>
6 <link rel="icon" type="image/x-icon" href="favicon.ico">
5 <link rel="stylesheet" href="{{.}}stylesheet"/>
6 <link rel="icon" type="image/x-icon" href="{{.}}favicon.ico">
77 </head>
88 <main>
99 <center>
10 <form method="get" action="search">
10 <form method="get" action="{{.}}search">
1111 <input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
1212 <select name="type">
1313 <option value="all">All</option>
@@ -16,7 +16,7 @@
1616 </select>
1717 <button type="submit">Search!</button>
1818 </form>
19 <h1><a href="dd">Daily Deviations</a> | <a href="about">About</a> | <a href="https://git.macaw.me/skunky/SkunkyArt" target="_blank">Source Code</a></h1>
19 <h1><a href="{{.}}dd">Daily Deviations</a> | <a href="{{.}}about">About</a> | <a href="https://git.macaw.me/skunky/SkunkyArt" target="_blank">Source Code</a></h1>
2020 </center>
2121 </main>
2222</html>
\ No newline at end of file