diff --git a/INSTANCES.md b/INSTANCES.md index c9a198a..32b0e50 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 | +|[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 | |[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..b61b0bd 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ -> [!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: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:ebloid.ru) Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md) diff --git a/app/parsers.go b/app/parsers.go index 192a88d..b7f15fd 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 ac65c3d..eddf0a9 100644 --- a/app/router.go +++ b/app/router.go @@ -9,7 +9,7 @@ import ( "strings" ) -var Host string +var Host, Path string func Router() { parsepath := func(path string) map[int]string { @@ -54,14 +54,15 @@ func Router() { // функция, что управляет всем handle := func(w http.ResponseWriter, r *http.Request) { - path := parsepath(r.URL.Path) + Path = r.URL.Path + path := parsepath(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 6ece2e8..9c8d400 100644 --- a/app/util.go +++ b/app/util.go @@ -63,7 +63,6 @@ type instanceAbout struct { type skunkyart struct { Writer http.ResponseWriter - _pth string Args url.Values Page int @@ -275,7 +274,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}}