Compare commits

...

3 Commits

Author SHA1 Message Date
f692d1eb2d забыл нажать ^s... 2024-11-15 23:34:29 +03:00
f857340dce офрцвагргш 2024-11-15 22:43:56 +03:00
911923fde1 ы 2024-11-15 22:43:27 +03:00
7 changed files with 18 additions and 14 deletions

View File

@ -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| |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 | |[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 | |[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 | |[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | Germany |

View File

@ -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.
<img src="static/images/logo.png" alt="SkunkyArt" title="SkunkyArt Logo" width="20%" loading="lazy"/> <img src="static/images/logo.png" alt="SkunkyArt" title="SkunkyArt Logo" width="20%" loading="lazy"/>
[![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) Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md)

View File

@ -46,7 +46,7 @@ func (s skunkyart) ParseComments(c devianter.Comments, daError devianter.Error)
if x.Parent > 0 { if x.Parent > 0 {
cmmts.WriteString(` In reply to <a href="`) cmmts.WriteString(` In reply to <a href="`)
cmmts.WriteString(Path) cmmts.WriteString(s._pth)
cmmts.WriteString("#") cmmts.WriteString("#")
cmmts.WriteString(strconv.Itoa(x.Parent)) cmmts.WriteString(strconv.Itoa(x.Parent))
cmmts.WriteString(`">`) cmmts.WriteString(`">`)

View File

@ -9,7 +9,7 @@ import (
"strings" "strings"
) )
var Host, Path string var Host string
func Router() { func Router() {
parsepath := func(path string) map[int]string { parsepath := func(path string) map[int]string {
@ -54,15 +54,14 @@ func Router() {
// функция, что управляет всем // функция, что управляет всем
handle := func(w http.ResponseWriter, r *http.Request) { handle := func(w http.ResponseWriter, r *http.Request) {
Path = r.URL.Path path := parsepath(r.URL.Path)
path := parsepath(Path)
Host = "http://" + r.Host Host = "http://" + r.Host
if h := r.Header["X-Forwarded-Proto"]; len(h) != 0 && h[0] == "https" { if h := r.Header["X-Forwarded-Proto"]; len(h) != 0 && h[0] == "https" {
Host = "https://" + r.Host Host = "https://" + r.Host
} }
var skunky = skunkyart{Version: Release.Version} var skunky = skunkyart{Version: Release.Version}
skunky._pth = r.URL.Path
skunky.Args = r.URL.Query() skunky.Args = r.URL.Query()
arg := skunky.Args.Get arg := skunky.Args.Get

View File

@ -63,6 +63,7 @@ type instanceAbout struct {
type skunkyart struct { type skunkyart struct {
Writer http.ResponseWriter Writer http.ResponseWriter
_pth string
Args url.Values Args url.Values
Page int Page int
@ -274,7 +275,7 @@ func (s skunkyart) NavBase(c DeviationList) string {
prevrev := func(msg string, page int, onpage bool) { prevrev := func(msg string, page int, onpage bool) {
if !onpage { if !onpage {
list.WriteString(`<a href="`) list.WriteString(`<a href="`)
list.WriteString(Path) list.WriteString(s._pth)
list.WriteString(`?p=`) list.WriteString(`?p=`)
list.WriteString(strconv.Itoa(page)) list.WriteString(strconv.Itoa(page))
if s.Type != 0 { if s.Type != 0 {

View File

@ -1,11 +1,11 @@
{ {
"instances": [ "instances": [
{ {
"title": "skunky.ebloid.ru", "title": "ls.404.mn",
"country": "Russia", "country": "Germany",
"urls": { "urls": {
"ygg": "http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art", "ygg": "http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart",
"clearnet": "https://skunky.ebloid.ru/art" "clearnet": "https://ls.404.mn/skunkyart"
}, },
"settings": { "settings": {
"proxy": true, "proxy": true,

View File

@ -6,7 +6,7 @@
<p> <p>
SkunkyArt is an alternative frontend for deviantart.com, written in Go. SkunkyArt is an alternative frontend for deviantart.com, written in Go.
</p> </p>
<h3><a href="https://go.kde.org/matrix/#/#skunkyart:ebloid.ru" target="_blank">Room in [matrix]</a></h3> <h3><a href="https://go.kde.org/matrix/#/#skunkyart:ls.404.mn" target="_blank">Room in [matrix]</a></h3>
<b>Instance settings:</b> <b>Instance settings:</b>
<ul> <ul>
<li><b>NSFW</b>: <span class="about-{{.Templates.About.Nsfw}}">{{if .Templates.About.Nsfw}}YES{{else}}NO{{end}}</span></li> <li><b>NSFW</b>: <span class="about-{{.Templates.About.Nsfw}}">{{if .Templates.About.Nsfw}}YES{{else}}NO{{end}}</span></li>
@ -44,6 +44,6 @@
{{end}} {{end}}
</ul> </ul>
</details> </details>
<p>Copyright <a href="https://go.kde.org/matrix/#/@softpigeones:ebloid.ru" target="_blank">lost+skunk</a>, X11. <a href="https://git.macaw.me/skunky/skunkyart/src/tag/v{{.Version}}" target="_blank">SkunkyArt v{{.Version}}</a></p> <p>Copyright <a href="https://go.kde.org/matrix/#/@softpigeones:ls.404.mn" target="_blank">lost+skunk</a>, X11. <a href="https://git.macaw.me/skunky/skunkyart/src/tag/v{{.Version}}" target="_blank">SkunkyArt v{{.Version}}</a></p>
</main> </main>
</html> </html>