From 911923fde11ed1e0efbc56f851f9b50e5e48665d Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Fri, 15 Nov 2024 22:43:27 +0300 Subject: [PATCH 01/11] =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INSTANCES.md | 2 +- README.md | 6 +++++- app/parsers.go | 2 +- app/router.go | 9 +++++---- app/util.go | 3 ++- static/html/about.htm | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/INSTANCES.md b/INSTANCES.md index 32b0e50..c9a198a 100644 --- a/INSTANCES.md +++ b/INSTANCES.md @@ -2,7 +2,7 @@ JSON variant should be used from master — https://git.macaw.me/skunky/SkunkyAr |Instance|Yggdrasil|I2P|Tor|NSFW|Proxifying|Modified Sources|Country| |:------:|:-------:|:-:|:-:|:--:|:--------:|:--------------:|:-----:| -|[skunky.ebloid.ru](https://skunky.ebloid.ru/art)|[Yes](http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art)|No|No| No | Yes | No | Russia | +|[ls.404.mn](https://ls.404.mn/skunkyart)|[Yes](http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart)|No|No| No | Yes | No | Germany | |[clovius.club](https://skunky.clovius.club)|No|No|No| Yes | Yes | No | Sweden | |[bloat.cat](https://skunky.bloat.cat)|No|No|No| Yes | Yes | No | Germany | |[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | Germany | diff --git a/README.md b/README.md index b61b0bd..f4b1b14 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ +> [!NOTE] +> Currently, due to school, I cannot actively develop this project :( +> However, this does not mean that development has stopped. Just wait for the summer. For questions, write either to the Matrix room or to me in DM. + SkunkyArt -[![Matrix room](https://img.shields.io/badge/matrix-000000?style=for-the-badge&logo=Matrix&logoColor=white)](https://go.kde.org/matrix/#/#skunkyart:ebloid.ru) +[![Matrix room](https://img.shields.io/badge/matrix-000000?style=for-the-badge&logo=Matrix&logoColor=white)](https://go.kde.org/matrix/#/#skunkyart:ls.404.mn) Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md) diff --git a/app/parsers.go b/app/parsers.go index b7f15fd..192a88d 100644 --- a/app/parsers.go +++ b/app/parsers.go @@ -46,7 +46,7 @@ func (s skunkyart) ParseComments(c devianter.Comments, daError devianter.Error) if x.Parent > 0 { cmmts.WriteString(` In reply to `) diff --git a/app/router.go b/app/router.go index eddf0a9..c7dd623 100644 --- a/app/router.go +++ b/app/router.go @@ -9,7 +9,9 @@ import ( "strings" ) -var Host, Path string +var Host string + +// var Path *string func Router() { parsepath := func(path string) map[int]string { @@ -54,15 +56,14 @@ func Router() { // функция, что управляет всем handle := func(w http.ResponseWriter, r *http.Request) { - Path = r.URL.Path - path := parsepath(Path) + path := parsepath(r.URL.Path) Host = "http://" + r.Host - if h := r.Header["X-Forwarded-Proto"]; len(h) != 0 && h[0] == "https" { Host = "https://" + r.Host } var skunky = skunkyart{Version: Release.Version} + skunky._pth = r.URL.Path skunky.Args = r.URL.Query() arg := skunky.Args.Get diff --git a/app/util.go b/app/util.go index 9c8d400..6ece2e8 100644 --- a/app/util.go +++ b/app/util.go @@ -63,6 +63,7 @@ type instanceAbout struct { type skunkyart struct { Writer http.ResponseWriter + _pth string Args url.Values Page int @@ -274,7 +275,7 @@ func (s skunkyart) NavBase(c DeviationList) string { prevrev := func(msg string, page int, onpage bool) { if !onpage { list.WriteString(`Room in [matrix] +

Room in [matrix]

Instance settings: -

Copyright lost+skunk, X11. SkunkyArt v{{.Version}}

+

Copyright lost+skunk, X11. SkunkyArt v{{.Version}}

From f857340dceb7a7499b92af34557d6bf214fceb29 Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Fri, 15 Nov 2024 22:43:56 +0300 Subject: [PATCH 02/11] =?UTF-8?q?=D0=BE=D1=84=D1=80=D1=86=D0=B2=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D0=B3=D1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/router.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/router.go b/app/router.go index c7dd623..ac65c3d 100644 --- a/app/router.go +++ b/app/router.go @@ -11,8 +11,6 @@ import ( var Host string -// var Path *string - func Router() { parsepath := func(path string) map[int]string { if l := len(CFG.URI); len(path) > l { From f692d1eb2d99e9a5c8030b196729a9fe896bb328 Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Fri, 15 Nov 2024 23:34:29 +0300 Subject: [PATCH 03/11] =?UTF-8?q?=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B6=D0=B0=D1=82=D1=8C=20^s...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- instances.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instances.json b/instances.json index a3a2f4a..3024c59 100644 --- a/instances.json +++ b/instances.json @@ -1,11 +1,11 @@ { "instances": [ { - "title": "skunky.ebloid.ru", - "country": "Russia", + "title": "ls.404.mn", + "country": "Germany", "urls": { - "ygg": "http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art", - "clearnet": "https://skunky.ebloid.ru/art" + "ygg": "http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart", + "clearnet": "https://ls.404.mn/skunkyart" }, "settings": { "proxy": true, From 86203ebb7b37e8f14f8fbed31710d07f37d2b473 Mon Sep 17 00:00:00 2001 From: vlnst Date: Tue, 26 Nov 2024 02:32:05 +0300 Subject: [PATCH 04/11] Add Docker --- .dockerignore | 6 ++++++ .gitignore | 1 + Dockerfile | 23 +++++++++++++++++++++++ compose.example.yaml | 12 ++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 compose.example.yaml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..6833fbe --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +cache +compose.yaml +*.json +LICENSE +*.md +services diff --git a/.gitignore b/.gitignore index b52ba21..63ca398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ **/cache +**/compose.yaml **/config.json **/skunkyart **/skunkyart-* diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..fdc1919 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +ARG GO_VERSION=1.18 + +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION} AS build +ARG TARGETOS +ARG TARGETARCH + +WORKDIR /build +COPY . . +RUN CGO_ENABLED=0 GOARCH=${TARGETARCH} GOOS=${TARGETOS} go build -ldflags "-s -w -extldflags '-static'" && \ + echo "skunkyart:x:10000:10000:SkunkyArt user:/:/sbin/nologin" > /etc/minimal-passwd && \ + echo "skunkyart:x:10000:" > /etc/minimal-group + +FROM scratch + +COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=build /build/static /static +COPY --from=build /build/skunkyart /skunkyart +COPY --from=build /etc/minimal-passwd /etc/passwd +COPY --from=build /etc/minimal-group /etc/group + +USER skunkyart + +ENTRYPOINT ["/skunkyart"] diff --git a/compose.example.yaml b/compose.example.yaml new file mode 100644 index 0000000..5eead70 --- /dev/null +++ b/compose.example.yaml @@ -0,0 +1,12 @@ +services: + skunkyart: + container_name: skunkyart + restart: unless-stopped + build: . + ports: + - "127.0.0.1:3003:3003" + security_opt: + - no-new-privileges:true + volumes: + - ./config.json:/config.json:ro + - ./cache:/cache # Ensure cache folder has a 10000:10000 ownership. From 866429cafc8a3a85a8f5b28eb876adf2003e5491 Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Sat, 4 Jan 2025 22:29:34 +0300 Subject: [PATCH 05/11] New domain and acknowledgement to vlnst --- INSTANCES.md | 2 +- README.md | 3 ++- instances.json | 4 ++-- static/html/about.htm | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/INSTANCES.md b/INSTANCES.md index c9a198a..49f21d8 100644 --- a/INSTANCES.md +++ b/INSTANCES.md @@ -2,7 +2,7 @@ JSON variant should be used from master — https://git.macaw.me/skunky/SkunkyAr |Instance|Yggdrasil|I2P|Tor|NSFW|Proxifying|Modified Sources|Country| |:------:|:-------:|:-:|:-:|:--:|:--------:|:--------------:|:-----:| -|[ls.404.mn](https://ls.404.mn/skunkyart)|[Yes](http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart)|No|No| No | Yes | No | Germany | +|[lost-skunk.cc](https://lost-skunk.cc/skunkyart)|[Yes](http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart)|No|No| No | Yes | No | Germany | |[clovius.club](https://skunky.clovius.club)|No|No|No| Yes | Yes | No | Sweden | |[bloat.cat](https://skunky.bloat.cat)|No|No|No| Yes | Yes | No | Germany | |[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | Germany | diff --git a/README.md b/README.md index f4b1b14..7f914bc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ SkunkyArt -[![Matrix room](https://img.shields.io/badge/matrix-000000?style=for-the-badge&logo=Matrix&logoColor=white)](https://go.kde.org/matrix/#/#skunkyart:ls.404.mn) +[![Matrix room](https://img.shields.io/badge/matrix-000000?style=for-the-badge&logo=Matrix&logoColor=white)](https://go.kde.org/matrix/#/#skunkyart:gnulinux.club) Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md) @@ -45,5 +45,6 @@ SkunkyArt 🦨 — альтернативный фронтенд к DeviantArt, 1. Инстанс не должен использовать Cloudflare итп. 2. Если ваш инстанс имеет модифицированный исходный код, то вам нужно опубликовать его на любую свободную площадку. Например, Github и Gitlab таковыми не являются. ## Благодарности +* [vlnst](https://git.bloat.cat/vlnst) — написал Docker-файл. * [Лис⚛](https://go.kde.org/matrix/#/@fox:matrix.org) — помог разобраться в Go и много чего полезного посоветовал по этому языку. * [meoww](https://codeberg.org/meoww) — перевела некоторые предложения на английский язык и написала сервис для openrc \ No newline at end of file diff --git a/instances.json b/instances.json index 3024c59..a38c86c 100644 --- a/instances.json +++ b/instances.json @@ -1,11 +1,11 @@ { "instances": [ { - "title": "ls.404.mn", + "title": "lost-skunk.cc", "country": "Germany", "urls": { "ygg": "http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart", - "clearnet": "https://ls.404.mn/skunkyart" + "clearnet": "https://lost-skunk.cc/skunkyart" }, "settings": { "proxy": true, diff --git a/static/html/about.htm b/static/html/about.htm index f6502af..ae2da3f 100644 --- a/static/html/about.htm +++ b/static/html/about.htm @@ -6,7 +6,7 @@

SkunkyArt is an alternative frontend for deviantart.com, written in Go.

-

Room in [matrix]

+

Room in [matrix]

Instance settings:
  • NSFW: {{if .Templates.About.Nsfw}}YES{{else}}NO{{end}}
    • @@ -44,6 +44,6 @@ {{end}}
-

Copyright lost+skunk, X11. SkunkyArt v{{.Version}}

+

Copyright lost+skunk, X11. SkunkyArt v{{.Version}}

From 92d4f4864a35ce3d121ae61166bdd229b78c7d94 Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Sat, 4 Jan 2025 22:32:18 +0300 Subject: [PATCH 06/11] =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20=D0=B2=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BD=D1=83=20=D0=BD=D0=B8=D0=BA=D0=B0=D0=BA..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7f914bc..e5f404d 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ To do this, you must either make a PR by adding your instance to the `instances. 1. the Instance must not use Cloudflare. 2. If your instance has modified source code, you need to publish it to any free platform. For example, Github and Gitlab are not. ## Acknowledgements +* [vlnst](https://git.bloat.cat/vlnst) — wrote a Docker file. * [Лис⚛](https://go.kde.org/matrix/#/@fox:matrix.org) — helped me understand Go and gave me a lot of useful advice on this language. * [meoww](https://codeberg.org/meoww) — translated some sentences into English and wrote a service for openrc From 32c61ec8ea577fdd37f7d50e1c176273960aa3e0 Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Tue, 11 Feb 2025 23:37:59 +0300 Subject: [PATCH 07/11] clovius.club >> orehus.club --- INSTANCES.md | 2 +- instances.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTANCES.md b/INSTANCES.md index 49f21d8..836b2fe 100644 --- a/INSTANCES.md +++ b/INSTANCES.md @@ -3,7 +3,7 @@ JSON variant should be used from master — https://git.macaw.me/skunky/SkunkyAr |Instance|Yggdrasil|I2P|Tor|NSFW|Proxifying|Modified Sources|Country| |:------:|:-------:|:-:|:-:|:--:|:--------:|:--------------:|:-----:| |[lost-skunk.cc](https://lost-skunk.cc/skunkyart)|[Yes](http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart)|No|No| No | Yes | No | Germany | -|[clovius.club](https://skunky.clovius.club)|No|No|No| Yes | Yes | No | Sweden | +|[orehus.club](https://sa.orehus.club)|No|No|No| Yes | No | No | Germany | |[bloat.cat](https://skunky.bloat.cat)|No|No|No| Yes | Yes | No | Germany | |[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | Germany | |[art.bloat.cat](https://art.bloat.cat)|No|No|No| Yes | Yes | No | Germany | \ No newline at end of file diff --git a/instances.json b/instances.json index a38c86c..0b5972c 100644 --- a/instances.json +++ b/instances.json @@ -13,13 +13,13 @@ } }, { - "title": "clovius.club", - "country": "Sweden", + "title": "orehus.club", + "country": "Germany", "urls": { - "clearnet": "https://skunky.clovius.club" + "clearnet": "https://sa.orehus.club" }, "settings": { - "proxy": true, + "proxy": false, "nsfw": true } }, From 048bb470ab8dc3adce83d2e615f3ab369efa2199 Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Sat, 22 Feb 2025 15:30:29 +0300 Subject: [PATCH 08/11] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BA=D0=B5=D1=88?= =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BE=D0=B7=D1=83,=20=D0=BD=D0=B5=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D1=88=D0=B8=D0=B5=20=D1=83=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D1=81=D1=81,=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=20=D0=BD=D1=81=D1=84=D0=B2,=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=20=D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=20=D0=BA=D0=B5=D1=88=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api.go | 8 ++++- app/cache.go | 72 +++++++++++++++++++++++++----------------- app/config.go | 7 ++-- app/wrapper.go | 13 ++++++-- config.example.json | 3 +- static/css/skunky.css | 30 ++++++++++++------ static/html/gruser.htm | 2 +- 7 files changed, 88 insertions(+), 47 deletions(-) diff --git a/app/api.go b/app/api.go index 048bc2a..d2a5655 100644 --- a/app/api.go +++ b/app/api.go @@ -41,12 +41,18 @@ func (a API) Error(description string, status int) { func (a API) sendMedia(d *devianter.Deviation) { mediaUrl, name := devianter.UrlFromMedia(d.Media) a.main.SetFilename(name) - if len(mediaUrl) != 0 { + return + } + + if CFG.Proxy { mediaUrl = mediaUrl[21:] dot := strings.Index(mediaUrl, ".") a.main.Writer.Header().Del("Content-Type") a.main.DownloadAndSendMedia(mediaUrl[:dot], mediaUrl[dot+11:]) + } else { + a.main.Writer.Header().Add("Location", mediaUrl) + a.main.Writer.WriteHeader(302) } } diff --git a/app/cache.go b/app/cache.go index f9225be..e03db67 100644 --- a/app/cache.go +++ b/app/cache.go @@ -38,17 +38,7 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) { fileName := sha1.Sum([]byte(subdomain + path)) filePath := CFG.Cache.Path + "/" + hex.EncodeToString(fileName[:]) - mx.Lock() - if tempFS[fileName] == nil { - tempFS[fileName] = &file{} - } - mx.Unlock() - - if tempFS[fileName].Content != nil { - response = tempFS[fileName].Content - tempFS[fileName].Score += 2 - break - } else { + c := func() { file, err := os.Open(filePath) if err != nil { if dwnld := Download(url.String()); dwnld.Status == 200 && dwnld.Headers["Content-Type"][0][:5] == "image" { @@ -63,27 +53,44 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) { try(e) response = file } + } - go func() { - defer restore() + if CFG.Cache.MemCache { + mx.Lock() + if tempFS[fileName] == nil { + tempFS[fileName] = &file{} + } + mx.Unlock() - mx.RLock() - tempFS[fileName].Content = response - mx.RUnlock() + if tempFS[fileName].Content != nil { + response = tempFS[fileName].Content + tempFS[fileName].Score += 2 + break + } else { + c() + go func() { + defer restore() - for { - time.Sleep(1 * time.Minute) + mx.RLock() + tempFS[fileName].Content = response + mx.RUnlock() - mx.Lock() - if tempFS[fileName].Score <= 0 { - delete(tempFS, fileName) + for { + time.Sleep(1 * time.Minute) + + mx.Lock() + if tempFS[fileName].Score <= 0 { + delete(tempFS, fileName) + mx.Unlock() + return + } + tempFS[fileName].Score-- mx.Unlock() - return } - tempFS[fileName].Score-- - mx.Unlock() - } - }() + }() + } + } else { + c() } case CFG.Proxy: dwnld := Download(url.String()) @@ -112,6 +119,7 @@ func InitCacheSystem() { println(err.Error()) } + var total int64 for _, file := range dir { fileName := c.Path + "/" + file.Name() fileInfo, err := file.Info() @@ -128,9 +136,15 @@ func InitCacheSystem() { } } - if c.MaxSize != 0 && fileInfo.Size() > c.MaxSize { - try(os.RemoveAll(fileName)) - } + total += fileInfo.Size() + // if c.MaxSize != 0 && fileInfo.Size() > c.MaxSize { + // try(os.RemoveAll(fileName)) + // } + } + + if c.MaxSize != 0 && total > c.MaxSize { + try(os.RemoveAll(c.Path)) + os.Mkdir(c.Path, 0700) } time.Sleep(time.Second * time.Duration(c.UpdateInterval)) diff --git a/app/config.go b/app/config.go index 2ba39a9..813453c 100644 --- a/app/config.go +++ b/app/config.go @@ -12,12 +12,13 @@ import ( ) var Release struct { - Version string + Version string Description string } type cache_config struct { Enabled bool + MemCache bool `json:"memcache"` Path string MaxSize int64 `json:"max-size"` Lifetime string @@ -93,9 +94,9 @@ func ExecuteConfig() { About = instanceAbout{ Proxy: CFG.Proxy, - Nsfw: CFG.Nsfw, + Nsfw: CFG.Nsfw, } - + static.StaticPath = CFG.StaticPath devianter.UserAgent = CFG.UserAgent } diff --git a/app/wrapper.go b/app/wrapper.go index 5cac175..5fe1dde 100644 --- a/app/wrapper.go +++ b/app/wrapper.go @@ -36,13 +36,12 @@ func (s skunkyart) GRUser() { for _, x := range g.Gruser.Page.Modules { switch x.Name { case "about", "group_about": - switch g.Owner.Group { - case true: + if g.Owner.Group { var about = &x.ModuleData.GroupAbout group.Group = true group.CreationDate = x.ModuleData.GroupAbout.FoundatedAt.UTC().String() group.About.DescriptionFormatted = ParseDescription(about.Description) - case false: + } else if false { group.About.A = x.ModuleData.About var about = &group.About.A group.CreationDate = time.Unix(time.Now().Unix()-x.ModuleData.About.RegDate, 0).UTC().String() @@ -186,6 +185,14 @@ func (s skunkyart) Deviation(author, postname string) { return } + if post.Post.Deviation.NSFW { + s.Writer.WriteHeader(403) + wr(s.Writer, `

NSFW content are disabled on this instance.

`) + return + } + if post.Post.Comments.Total <= 50 { post.Post.Comments.Cursor = "" } diff --git a/config.example.json b/config.example.json index b38e47e..70e1c1b 100644 --- a/config.example.json +++ b/config.example.json @@ -6,11 +6,12 @@ "path": "cache", "lifetime": null, "max-size": 200, + "memcache": false, "update-interval": 5 }, "static-path": "static", "download-proxy": "http://127.0.0.1:8080", "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36", "proxy": true, - "nsfw": true + "nsfw": false } diff --git a/static/css/skunky.css b/static/css/skunky.css index a7258c8..09cc71c 100644 --- a/static/css/skunky.css +++ b/static/css/skunky.css @@ -1,6 +1,6 @@ /* TAGS */ html { - font-family: Ubuntu; + font-family: ubuntu, system-ui; background-color:black; color: rgb(234, 216, 216); } @@ -45,24 +45,22 @@ input:focus { justify-content: center; } .block { - max-width: 20%; - height: 0%; - padding: 4px; - border-radius: 2px; - border: 3px solid #091f19; + padding: 0px 0px 6px 0px; + border: 3px solid #000; word-break: break-all; background-color: #091f19; margin-left: 5px; margin-top: 5px; text-align: center; } +.block h1 { + padding: 8.5vh; +} .block:hover { border: 3px solid #4d27d6; transition: 400ms; } -.block img, .plates .user-plate img { - width: 100%; -} + .block p { word-break: break-all; } @@ -185,6 +183,20 @@ input:focus { font-size: 60%; max-width: 80% } + .block img, .plates .user-plate img { + width: 100%; + } +} + +@media (orientation: landscape) { + .block { + width: 20%; + } + .block img, .plates .user-plate img { + width: 100%; + height: 30vh; + object-fit: cover; + } } @media (max-width: 1462px) and (orientation: landscape) { diff --git a/static/html/gruser.htm b/static/html/gruser.htm index 6593951..4e8e3d1 100644 --- a/static/html/gruser.htm +++ b/static/html/gruser.htm @@ -30,7 +30,7 @@

| {{.Templates.GroupUser.GR.Owner.Username}}

{{if eq .Type 'a'}} - {{if ne .Templates.GroupUser.About.BG ""}} + {{if and (and (ne .Templates.About.Nsfw true) (ne .Templates.GroupUser.About.BGMeta.NSFW true)) (ne .Templates.GroupUser.About.BG "")}} {{end}} From 40d3d89623836fbcdea6efbcdbc4611f20528cfe Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Sun, 23 Feb 2025 22:03:02 +0300 Subject: [PATCH 09/11] =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/wrapper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/wrapper.go b/app/wrapper.go index 5fe1dde..ef1fb31 100644 --- a/app/wrapper.go +++ b/app/wrapper.go @@ -185,7 +185,7 @@ func (s skunkyart) Deviation(author, postname string) { return } - if post.Post.Deviation.NSFW { + if post.Post.Deviation.NSFW && !CFG.Nsfw { s.Writer.WriteHeader(403) wr(s.Writer, ` Date: Wed, 19 Mar 2025 14:45:29 +0300 Subject: [PATCH 10/11] Add sa.dc09.ru --- instances.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/instances.json b/instances.json index 0b5972c..725e524 100644 --- a/instances.json +++ b/instances.json @@ -55,6 +55,17 @@ "proxy": true, "nsfw": true } + }, + { + "title": "dc09.ru", + "country": "Russia", + "urls": { + "clearnet": "https://sa.dc09.ru" + }, + "settings": { + "proxy": true, + "nsfw": false + } } ] } \ No newline at end of file From 71a07e074edf9251b4d53c3bf4031f08cdc48027 Mon Sep 17 00:00:00 2001 From: lost+skunk Date: Wed, 19 Mar 2025 14:49:35 +0300 Subject: [PATCH 11/11] Add sa.dc09.ru --- INSTANCES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/INSTANCES.md b/INSTANCES.md index 836b2fe..e5fffdd 100644 --- a/INSTANCES.md +++ b/INSTANCES.md @@ -6,4 +6,5 @@ JSON variant should be used from master — https://git.macaw.me/skunky/SkunkyAr |[orehus.club](https://sa.orehus.club)|No|No|No| Yes | No | No | Germany | |[bloat.cat](https://skunky.bloat.cat)|No|No|No| Yes | Yes | No | Germany | |[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | Germany | -|[art.bloat.cat](https://art.bloat.cat)|No|No|No| Yes | Yes | No | Germany | \ No newline at end of file +|[art.bloat.cat](https://art.bloat.cat)|No|No|No| Yes | Yes | No | Germany | +|[dc09.ru](https://sa.dc09.ru)|No|No|No| No | Yes | No | Russia | \ No newline at end of file