+> [!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.
-[](https://go.kde.org/matrix/#/#skunkyart:ebloid.ru)
+
-Instances: [`INSTANCES.md`](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/INSTANCES.md)
+[](https://go.kde.org/matrix/#/#skunkyart:gnulinux.club)
+
+Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md)
# EN 🇺🇸
## Description
SkunkyArt 🦨 — alternative frontend for DevianArt, which works without JS.
+## Build (translated via DeepL)
+It is recommended to build with the 'embed' tag because it embeds the presets in the binary. If you plan to modify the templates, then do not use this tag. You can also add the `-ldflags "-w -s"` argument (GCCGO has a different name for it — `gccgoflags`) to reduce the size of the output file. Here is an example:
+
+`go build -tags embed -ldflags "-w -s"`
+
+Pre-compiled binaries can be found in the [Releases](https://git.macaw.me/skunky/skunkyart/releases) tab.
## Setup
The sample config is in the `config.example.json` file. For custom config, use `--config` option.
-See the [`SETUP.md`](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/SETUP.md) file for more info about directives.
+See the [`SETUP.md`](/skunky/SkunkyArt/src/branch/master/SETUP.md) file for more info about directives.
## Adding instance to the list
To do this, you must either make a PR by adding your instance to the `instances.json` and `INSTANCES.md` files (you can use `--add-instance` cli-argument to automatically add the instance to these files), or create an Issue, or report it to the room in Matrix. Keep in mind that your instance must comply with the following rules:
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
# RU 🇷🇺
## Описание
SkunkyArt 🦨 — альтернативный фронтенд к DeviantArt, который полностью работает без JS (JavaScript).
+## Сборка
+Рекомендуется производить сборку с тегом 'embed', поскольку он встраивает заготовки в бинарный файл. Если вы планируете изменять заготовки, то не используйте этот тег. Также вы можете добавить аргумент `-ldflags "-w -s"` (у GCCGO он называется по-другому — `gccgoflags`) для уменьшения размера выходного файла. Вот пример:
+
+`go build -tags embed -ldflags "-w -s"`
+
+Готовые бинари находятся во вкладке [Releases](https://git.macaw.me/skunky/skunkyart/releases).
## Настройка
Пример конфига находится в файле `config.example.json`. Чтобы указать свой конфиг, используйте cli-аргумент `--config`.
-См. [`SETUP-RU.md`](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/SETUP-RU.md) для информации о настройки фронтенда.
+См. [`SETUP-RU.md`](/skunky/SkunkyArt/src/branch/master/SETUP-RU.md) для информации о настройки фронтенда.
## Добавление инстанса в список
Чтобы это сделать, вы должны либо сделать PR, добавив в файлы `instances.json` и `INSTANCES.md` свой инстанс (можете воспользоваться cli-аргументом `--add-instance`, который автоматически это сделает), либо создать Issue, или сообщить о нём в комнате в Matrix. Учтите, что ваш инстанс должен соблюсти следущие правила:
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/REDIRECTS.md b/REDIRECTS.md
new file mode 100644
index 0000000..2469977
--- /dev/null
+++ b/REDIRECTS.md
@@ -0,0 +1,13 @@
+# Search
+* `deviantart.com/search?q=$QUERY` => `/search?q=$QUERY&type=all`
+# Daily Deviations
+* `deviantart.com` => `/dd`
+# Deviations
+* (`$USER_GROUP.deviantart.com/art/$ID`|`deviantart.com/$USER_GROUP/art/$ID`) => `/post/$USER_GROUP/$ID`
+# Groups and users
+## Main user page
+* (`$USER_GROUP.deviantart.com`|`deviantart.com/$USER_GROUP`) => `/group_user?type=about&q=$USER_GROUP`
+## Gallery
+* (`$USER_GROUP.deviantart.com/gallery`|`deviantart.com/$USER_GROUP/gallery`) => `/group_user?type=gallery&q=$USER_GROUP`
+## Favourites
+* (`$USER_GROUP.deviantart.com/favourites`|`deviantart.com/$USER_GROUP/favourites`) => `/group_user?type=favourites&q=$USER_GROUP`
diff --git a/SETUP-RU.md b/SETUP-RU.md
index 6ff3c23..7d7d04c 100644
--- a/SETUP-RU.md
+++ b/SETUP-RU.md
@@ -1,4 +1,4 @@
-[English version 🇬🇧](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/SETUP.md)
+[English version 🇬🇧](/skunky/SkunkyArt/src/branch/master/SETUP.md)
# Единицы измерения
Размер файла в кеше измеряется в мегабайтах.DeviantArt error — '`) + msg.WriteString(dAerr.Error) + msg.WriteString("'
") + + wr(s.Writer, msg.String()) +} + func (s skunkyart) ReturnHTTPError(status int) { s.Writer.WriteHeader(status) @@ -85,21 +173,29 @@ func (s skunkyart) ReturnHTTPError(status int) { wr(s.Writer, msg.String()) } +func (s skunkyart) SetFilename(name string) { + var filename strings.Builder + filename.WriteString(`filename="`) + filename.WriteString(name) + filename.WriteString(`"`) + s.Writer.Header().Add("Content-Disposition", filename.String()) +} + type Downloaded struct { Headers http.Header Status int Body []byte } -func Download(url string) (d Downloaded) { +func Download(urlString string) (d Downloaded) { cli := &http.Client{} if CFG.DownloadProxy != "" { - u, e := u.Parse(CFG.DownloadProxy) + u, e := url.Parse(CFG.DownloadProxy) try(e) cli.Transport = &http.Transport{Proxy: http.ProxyURL(u)} } - req, e := http.NewRequest("GET", url, nil) + req, e := http.NewRequest("GET", urlString, nil) try(e) req.Header.Set("User-Agent", CFG.UserAgent) @@ -115,97 +211,20 @@ func Download(url string) (d Downloaded) { return } -// caching -func (s skunkyart) DownloadAndSendMedia(subdomain, path string) { - var url strings.Builder - url.WriteString("https://images-wixmp-") - url.WriteString(subdomain) - url.WriteString(".wixmp.com/") - url.WriteString(path) - url.WriteString("?token=") - url.WriteString(s.Args.Get("token")) - - if CFG.Cache.Enabled { - fname := CFG.Cache.Path + "/" + base64.StdEncoding.EncodeToString([]byte(subdomain+path)) - file, e := os.Open(fname) - - if e != nil { - dwnld := Download(url.String()) - if dwnld.Status == 200 && dwnld.Headers["Content-Type"][0][:5] == "image" { - try(os.WriteFile(fname, dwnld.Body, 0700)) - s.Writer.Write(dwnld.Body) - } - } else { - file, e := io.ReadAll(file) - try(e) - s.Writer.Write(file) - } - } else if CFG.Proxy { - dwnld := Download(url.String()) - s.Writer.Write(dwnld.Body) - } else { - s.Writer.WriteHeader(403) - s.Writer.Write([]byte("Sorry, butt proxy on this instance are disabled.")) - } -} - -func InitCacheSystem() { - c := &CFG.Cache - os.Mkdir(CFG.Cache.Path, 0700) - for { - dir, e := os.Open(c.Path) - try(e) - stat, e := dir.Stat() - try(e) - - dirnames, e := dir.Readdirnames(-1) - try(e) - for _, a := range dirnames { - a = c.Path + "/" + a - if c.Lifetime != "" { - now := time.Now().UnixMilli() - - f, _ := os.Stat(a) - stat := f.Sys().(*syscall.Stat_t) - time := time.Unix(stat.Ctim.Unix()).UnixMilli() - - if time+lifetimeParsed <= now { - try(os.RemoveAll(a)) - } - } - if c.MaxSize != 0 && stat.Size() > c.MaxSize { - try(os.RemoveAll(a)) - } - } - - dir.Close() - time.Sleep(time.Second * time.Duration(CFG.Cache.UpdateInterval)) - } -} - -func CopyTemplatesToMemory() { - for _, dirname := range CFG.Dirs { - dir, e := os.ReadDir(dirname) - tryWithExitStatus(e, 1) - - for _, x := range dir { - file, e := os.ReadFile(dirname + "/" + x.Name()) - tryWithExitStatus(e, 1) - Templates[x.Name()] = string(file) - } - } -} - /* PARSING HELPERS */ func ParseMedia(media devianter.Media, thumb ...int) string { - url := devianter.UrlFromMedia(media, thumb...) - if len(url) != 0 && CFG.Proxy { - url = url[21:] - dot := strings.Index(url, ".") - - return UrlBuilder("media", "file", url[:dot], url[dot+11:]) + mediaUrl, filename := devianter.UrlFromMedia(media, thumb...) + if len(mediaUrl) != 0 && CFG.Proxy { + mediaUrl = mediaUrl[21:] + dot := strings.Index(mediaUrl, ".") + if filename == "" { + filename = "image.gif" + } + return UrlBuilder("media", "file", mediaUrl[:dot], mediaUrl[dot+11:], "&filename=", filename) + } else if !CFG.Proxy { + return mediaUrl } - return url + return "" } func ConvertDeviantArtUrlToSkunkyArt(url string) (output string) { @@ -255,7 +274,9 @@ func (s skunkyart) NavBase(c DeviationList) string { list.WriteString("") prevrev := func(msg string, page int, onpage bool) { if !onpage { - list.WriteString(` 0 { - group.Gallery.List = s.DeviationList(gallery.Content.Results, true, DeviationList{ - More: gallery.Content.HasMore, + if daError.RAW != nil { + s.Error(daError) + return + } + + if folderid > 0 || (s.Type == 'f' && all) { + group.Gallery.List = s.DeviationList(content.Content.Results, true, DeviationList{ + More: content.Content.HasMore, }) } else { - for _, x := range gallery.Content.Gruser.Page.Modules { + for _, x := range content.Content.Gruser.Page.Modules { if l := len(x.ModuleData.Folders.Results); l != 0 { var folders strings.Builder folders.WriteString(`
# Folders
`) for _, x := range x.ModuleData.Folders.Results { - folders.WriteString(`
`)
+ if x.FolderId != -1 && x.Size != 0 {
+ folders.WriteString(`
") - - folders.WriteString(``) - folders.WriteString(x.Name) - folders.WriteString(``) - - folders.WriteString("
")
}
folders.WriteString(``)
- if !(x.Thumb.NSFW && !CFG.Nsfw) {
- folders.WriteString(`
- folders.WriteString(ParseMedia(x.Thumb.Media))
- folders.WriteString(` "`)
- folders.WriteString(x.Thumb.Title)
- folders.WriteString(`")
`)
- } else {
- folders.WriteString(`
+ folders.WriteString(ParseMedia(x.Thumb.Media))
+ folders.WriteString(` "`)
+ folders.WriteString(x.Thumb.Title)
+ folders.WriteString(`")
`)
+ } else {
+ folders.WriteString(`
") + + folders.WriteString(``) + folders.WriteString(x.Name) + folders.WriteString(``) + + folders.WriteString("
")
}
- folders.WriteString("[ NSFW ]
`) + if !(x.Thumb.NSFW && !CFG.Nsfw) { + folders.WriteString(`[ NSFW ]
`) + } + folders.WriteString("") + + folders.WriteString(``) + folders.WriteString(x.Name) + folders.WriteString(``) + + folders.WriteString("
") - - folders.WriteString(``) - folders.WriteString(x.Name) - folders.WriteString(``) - - folders.WriteString("
# Content
`) group.Gallery.Folders = folders.String() @@ -209,7 +163,7 @@ func (s skunkyart) GRUser() { } if !s.Atom { - s.ExecuteTemplate("gruser.htm", &s) + s.ExecuteTemplate("gruser.htm", "html", &s) } } @@ -221,19 +175,34 @@ func (s skunkyart) Deviation(author, postname string) { return } + var err devianter.Error post := &s.Templates.Deviation id := id_search[len(id_search)-1] - post.Post = devianter.GetDeviation(id, author) + post.Post, err = devianter.GetDeviation(id, author) + if err.RAW != nil { + s.Error(err) + return + } + + if post.Post.Deviation.NSFW && !CFG.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 = "" + } if post.Post.Deviation.TextContent.Excerpt != "" { post.Post.Description = ParseDescription(post.Post.Deviation.TextContent) } else { post.Post.Description = ParseDescription(post.Post.Deviation.Extended.DescriptionText) } - // время публикации - post.StringTime = post.Post.Deviation.PublishedTime.UTC().String() - post.Post.IMG = ParseMedia(post.Post.Deviation.Media) + for _, x := range post.Post.Deviation.Extended.RelatedContent { if len(x.Deviations) != 0 { post.Related += s.DeviationList(x.Deviations, false) @@ -252,17 +221,19 @@ func (s skunkyart) Deviation(author, postname string) { post.Tags += tag.String() } - if post.Post.Comments.Total <= 50 { - post.Post.Comments.Cursor = "" - } - post.Comments = s.ParseComments(devianter.GetComments(id, post.Post.Comments.Cursor, s.Page, 1)) + post.StringTime = post.Post.Deviation.PublishedTime.UTC().String() + post.Post.IMG = ParseMedia(post.Post.Deviation.Media) - s.ExecuteTemplate("deviantion.htm", &s) + s.ExecuteTemplate("deviantion.htm", "html", &s) } func (s skunkyart) DD() { - dd := devianter.GetDailyDeviations(s.Page) + dd, err := devianter.GetDailyDeviations(s.Page) + if err.RAW != nil { + s.Error(err) + return + } var strips strings.Builder for _, x := range dd.Strips { strips.WriteString(`
-
-
- SkunkyArt | Daily Deviations
-
-
-
-
-
-
- {{if ne .Templates.DDStrips ""}}
-
-
\ No newline at end of file
diff --git a/html/index.htm b/html/index.htm
deleted file mode 100644
index 08feba5..0000000
--- a/html/index.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- SkunkyArt
-
-
-
-
-
-
- Daily Deviations | About | Source Code
-
-
-
\ No newline at end of file
diff --git a/html/search.htm b/html/search.htm
deleted file mode 100644
index df1cf85..0000000
--- a/html/search.htm
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- SkunkyArt | Search "{{.QueryRaw}}"
-
-
-
-
-
- HOME | DD
-
-
- {{if ne .Templates.Search.List ""}}
- {{if ne .Templates.Search.Content.Total 0}}
- Results by request '{{.QueryRaw}}': {{.Templates.Search.Content.Total}}
- {{end}}
- {{.Templates.Search.List}}
- {{else}}
- No results :(
- {{end}}
-
-
\ No newline at end of file
diff --git a/instances.json b/instances.json
index cd95b78..725e524 100644
--- a/instances.json
+++ b/instances.json
@@ -1,59 +1,70 @@
{
"instances": [
{
- "title": "skunky.ebloid.ru",
- "country": "Russia",
+ "title": "lost-skunk.cc",
+ "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://lost-skunk.cc/skunkyart"
},
"settings": {
- "nsfw": false,
- "proxy": false
+ "proxy": true,
+ "nsfw": false
}
},
{
- "title": "clovius.club",
- "country": "Sweden",
+ "title": "orehus.club",
+ "country": "Germany",
"urls": {
- "clearnet": "https://skunky.clovius.club"
+ "clearnet": "https://sa.orehus.club"
},
"settings": {
- "nsfw": true,
- "proxy": true
+ "proxy": false,
+ "nsfw": true
}
},
{
"title": "bloat.cat",
- "country": "Romania",
+ "country": "Germany",
"urls": {
"clearnet": "https://skunky.bloat.cat"
},
"settings": {
- "nsfw": true,
- "proxy": true
- }
- },
- {
- "title": "frontendfriendly.xyz",
- "country": "Finland",
- "urls": {
- "clearnet": "https://skunkyart.frontendfriendly.xyz"
- },
- "settings": {
- "nsfw": true,
- "proxy": true
+ "proxy": true,
+ "nsfw": true
}
},
{
"title": "lumaeris.com",
- "country": "US",
+ "country": "Germany",
"urls": {
"clearnet": "https://skunkyart.lumaeris.com"
},
"settings": {
- "nsfw": true,
- "proxy": true
+ "proxy": true,
+ "nsfw": true
+ }
+ },
+ {
+ "title": "art.bloat.cat",
+ "country": "Germany",
+ "urls": {
+ "clearnet": "https://art.bloat.cat"
+ },
+ "settings": {
+ "proxy": true,
+ "nsfw": true
+ }
+ },
+ {
+ "title": "dc09.ru",
+ "country": "Russia",
+ "urls": {
+ "clearnet": "https://sa.dc09.ru"
+ },
+ "settings": {
+ "proxy": true,
+ "nsfw": false
}
}
]
diff --git a/main.go b/main.go
index 0224816..d7009ae 100644
--- a/main.go
+++ b/main.go
@@ -2,17 +2,20 @@ package main
import (
"skunkyart/app"
+ "skunkyart/static"
"time"
"git.macaw.me/skunky/devianter"
)
func main() {
+ app.Release.Version = "1.3.2"
+ app.Release.Description = "Two API endpoints and template embedding into binary"
go app.RefreshInstances()
app.ExecuteCommandLineArguments()
app.ExecuteConfig()
- app.CopyTemplatesToMemory()
+ static.CopyTemplatesToMemory()
go func() {
for {
diff --git a/css/skunky.css b/static/css/skunky.css
similarity index 81%
rename from css/skunky.css
rename to static/css/skunky.css
index 2126968..09cc71c 100644
--- a/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);
}
@@ -19,15 +19,21 @@ header h1 {
header form {
align-self: center;
}
-header {
+header, form {
display: flex;
}
+form {
+ border: solid #164e3e 1px;
+ max-width: fit-content;
+}
form input, button, select {
background-color: #134134;
padding: 5px;
color: whitesmoke;
- border: 0px;
- border-radius: 1px;
+ border: 0;
+}
+input:focus {
+ outline: none;
}
/* BLOCKS */
@@ -39,24 +45,22 @@ form input, button, select {
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;
}
@@ -140,19 +144,18 @@ form input, button, select {
font-size: 80%
}
- center form {
- font-size: 60%
- }
-
- header form {
- font-size: 60%;
- }
- header, center {
+ header {
+ margin-left: 3%;
text-align: center;
- display: block;
+ display: inline-block;
clear: both;
font-size: 200%;
}
+
+ form {
+ font-size: 60%;
+ border: solid #164e3e 5px;
+ }
.content {
margin: auto;
@@ -180,6 +183,20 @@ form input, button, select {
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/html/about.htm b/static/html/about.htm
similarity index 64%
rename from html/about.htm
rename to static/html/about.htm
index edb576d..ae2da3f 100644
--- a/html/about.htm
+++ b/static/html/about.htm
@@ -1,27 +1,12 @@
-
- SkunkyArt
-
-
-
+ {{template "head" .}}
-
- HOME | DD
-
-
+ {{template "header" .}}
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}}
@@ -59,6 +44,6 @@
{{end}}
- Copyright lost+skunk, X11. SkunkyArt v1.3.1
+ Copyright lost+skunk, X11. SkunkyArt v{{.Version}}
-
\ No newline at end of file
+
Daily Deviations | About | Source Code
-HOME | DD
- -Results by request '{{.QueryRaw}}': {{.Templates.Search.Content.Total}}
- {{end}} - {{.Templates.Search.List}} - {{else}} -No results :(
- {{end}} -HOME | DD
- -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}} @@ -59,6 +44,6 @@ {{end}}
Copyright lost+skunk, X11. SkunkyArt v1.3.1
+Copyright lost+skunk, X11. SkunkyArt v{{.Version}}