Commit `2dfeaae772`

2dfeaae772e630ae361a35bf4680257d081560c1

parent: e02174cb71

Unsigned

lost+skunk <skunky@ebloid.ru> · 2024-07-29 22:06 UTC

Подготовка к релизу v1.3.1

Layout: unified · split

README.md +22 −17

+<img src="https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/misc/logo.png" alt="SkunkyArt" title="SkunkyArt Logo" width="20%"/>
 [![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
-|Инстанс|Yggdrasil|I2P|Tor|NSFW|Proxifying|Country|
+|Instance|Yggdrasil|I2P|Tor|NSFW|Proxifying|Country|
-|:-----:|:-------:|:-:|:-:|:--:|:--------:|:-----:|
+|:------:|:-------:|:-:|:-:|:--:|:--------:|:-----:|
 |[skunky.ebloid.ru](https://skunky.ebloid.ru/art)|[Yes](http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art)|No|No| No | No | Russia |
 |[clovius.club](https://skunky.clovius.club)|No|No|No| Yes | Yes | Sweden |
 |[bloat.cat](https://skunky.bloat.cat)|No|No|No| Yes | Yes | Romania |
 |[frontendfriendly.xyz](https://skunkyart.frontendfriendly.xyz)|No|No|No| Yes | Yes | Finland |
+|[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | US |
 # EN 🇺🇸
 ## Description
 ## Config
 The sample config is in the `config.example.json` file. To specify your own path to the config, use the CLI argument `-c` or `--config`.
 * `listen` -- the address and port on which SkunkyArt will listen
-* `base-path` -- the path to the instance. Example: "`base-path`:"/art/" -> https://skunky.ebloid.ru/art/
+* `base-path` -- the path to the instance. Example: `"base-path":"/art/"` -> https://skunky.ebloid.ru/art/
 * `cache` -- caching system; default is off.
-* * `path` -- the path to the cache
+  * `path` -- the path to the cache
-* * `lifetime` -- cache file lifetime; measured in Unix milliseconds.
+  * `lifetime` -- the lifetime of the file in the cache. Units: i, h, d, w, m, y. I -- minute, all other units I think are self-explanatory.
-* * `max-size` -- maximum file size in bytes.
+  * `max-size` -- maximum file size in megabytes.
-* `dirs-to-memory` -- this setting determines which directories will be copied to RAM when SkunkyArt is started. Required
+* `dirs-to-memory` -- this setting determines which directories will be copied to RAM when SkunkyArt is started. Mandatory
 * `download-proxy` -- proxy address for downloading files.
 ## Examples of reverse proxies
 Nginx:
     listen 443 ssl;
     server_name skunky.example.com;
-    location ((BASE URL)) { # if you have a separate subdomain for the frontend, insert '/' instead of '((BASE URL))'.
+    location ((BASE URL)) { # if you have a separate subdomain for the frontend, insert '/' instead of '((BASE URL)))'.
-        proxy_set_header Scheme $scheme;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header Host $host;
         proxy_http_version 1.1;
         proxy_pass http://((IP)):((PORT));
     }
 }
 ```
+Pretty much business as usual, except for the [`X-Forwarded-Proto`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto) header setting.
 ## How do I add my instance to the list?
-To do this, you must either make a PR by adding your instance to the `instances.json` file, or report it to the room in Matrix. I don't think it needs any description. However, be aware, this list has a couple rules:
+To do this, you must either make a PR by adding your instance to the `instances.json` and `README.md` files, or create an Issue, or report it to the room in Matrix. I don't think it needs any description. However, be warned, this list has a couple rules:
-1. the instance must not use Cloudflare.
+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
 * [Лис⚛](https://go.kde.org/matrix/#/@fox:matrix.org) -- helped me understand Go and gave me a lot of useful advice on this language.
 ## Конфиг
 Пример конфига находится в файле `config.example.json`. Чтобы указать свой путь до конфига, используйте CLI-аргумент `-c` или `--config`.
 * `listen` -- адрес и порт, на котором будет слушать SkunkyArt
-* `base-path` -- путь к инстансу. Пример: "base-path": "/art/" -> https://skunky.ebloid.ru/art/
+* `base-path` -- путь к инстансу. Пример: `"base-path": "/art/"` -> https://skunky.ebloid.ru/art/
 * `cache` -- система кеширования; по умолчанию - выкл.
-* * `path` -- путь до кеша
+  * `path` -- путь до кеша
-* * `lifetime` -- время жизни файла в кеше; измеряется в Unix-миллисекундах
+  * `lifetime` -- время жизни файла в кеше. Единицы измерения: i, h, d, w, m, y. I -- минута, всё остальные единицы измерения, я считаю понятными и без объяснения.
-* * `max-size` -- максимальный размер файла в байтах
+  * `max-size` -- максимальный размер файла в мегабайтах
 * `dirs-to-memory` -- данная настройка определяет какие каталоги будут скопированы в ОЗУ при запуске SkunkyArt. Обязательна
 * `download-proxy` -- адрес прокси для загрузки файлов
 ## Примеры reverse-прокси
     server_name skunky.example.com;
     location ((BASE URL)) { # если у вас отдельный поддомен для фронтенда, вместо '((BASE URL))' вставляйте '/'
-        proxy_set_header Scheme $scheme;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header Host $host;
         proxy_http_version 1.1;
         proxy_pass http://((IP)):((PORT));
     }
 }
 ```
+В целом, всё как обычно, за исключением настройки заголовка [`X-Forwarded-Proto`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto).
 ## Как добавить свой инстанс в список?
-Чтобы это сделать, вы должны либо сделать PR, добавив в файл `instances.json` свой инстанс, либо сообщить о нём в комнате в Matrix. Думаю, он не нуждается в описании. Однако учтите, у этого списка есть пара правил:
+Чтобы это сделать, вы должны либо сделать PR, добавив в файлы `instances.json` и `README.md` свой инстанс, либо создать Issue, или сообщить о нём в комнате в Matrix. Думаю, он не нуждается в описании. Однако учтите, у этого списка есть пара правил:
 1. Инстанс не должен использовать Cloudflare.
 2. Если ваш инстанс имеет модифицированный исходный код, то вам нужно опубликовать его на любую свободную площадку. Например, Github и Gitlab таковыми не являются.
 ## Благодарности

TODO.md +13 −4

	@@ -1,7 +1,16 @@
1	# v1.3.x	1	# v1.3.x
2	* Доделать парсинг описания	2	* Написать Makefile
3	* Реализовать миниатюры и оптимизировать CSS под маленькие экраны	3	* Почистить говнокод
		4	* Доделать парсинг описания
		5	* Избавиться от хардкода под Linux
		6	* ~~Реализовать стрипы в ежедневных артах~~
		7	* ~~Исправить баг с навигацией по страницам~~
		8	* ~~Сделать единицы в конфиге более понятными~~
		9	* Добавить возможность включить темплейты в бинарник
		10	* ~~Реализовать миниатюры и оптимизировать CSS под маленькие экраны~~
		11	* Реализовать отображение контента, отличного от картинок (видео, аудио, etc)
		12	* Улучшить систему кеширования: добавить рейтинг для удаления и копирование изображений в ОЗУ
4	# v1.4	13	# v1.4
		14	* Реализовать API
5	* Реализовать темы	15	* Реализовать темы
6	* Реализовать многоязычный интерфейс	16	* Реализовать многоязычный интерфейс\ No newline at end of file
7	* Реализовать API\ No newline at end of file

app/config.go +53 −16

 import (
 	"encoding/json"
 	"os"
+	"regexp"
+	"strconv"
 	"time"
+	"git.macaw.me/skunky/devianter"
 )
 type cache_config struct {
 	Enabled        bool
 	Path           string
 	MaxSize        int64 `json:"max-size"`
-	Lifetime       int64
+	Lifetime       string
 	UpdateInterval int64 `json:"update-interval"`
 }
 	BasePath      string `json:"base-path"`
 	Cache         cache_config
 	Proxy, Nsfw   bool
+	UserAgent     string   `json:"user-agent"`
 	DownloadProxy string   `json:"download-proxy"`
 	Dirs          []string `json:"dirs-to-memory"`
 }
 		Path:           "cache",
 		UpdateInterval: 1,
 	},
-	Dirs:  []string{"html", "css"},
+	Dirs:      []string{"html", "css"},
-	Proxy: true,
+	UserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
-	Nsfw:  true,
+	Proxy:     true,
+	Nsfw:      true,
 }
+var lifetimeParsed int64
 func ExecuteConfig() {
 	go func() {
-		defer func() {
-			if r := recover(); r != nil {
-				recover()
-			}
-		}()
 		for {
-			Templates["instances.json"] = string(Download("https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/instances.json").Body)
+			func() {
-			time.Sleep(1 * time.Second)
+				defer func() {
+					if r := recover(); r != nil {
+						recover()
+					}
+				}()
+				Templates["instances.json"] = string(Download("https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/instances.json").Body)
+			}()
+			time.Sleep(1 * time.Hour)
 		}
 	}()
-	const helpmsg = `SkunkyArt v1.3 [refactoring]
+	const helpmsg = `SkunkyArt v1.3.1 [CSS improvements for mobile and strips on Daily Deviations]
 Usage:
 	- [-c|--config] - path to config
 	- [-h|--help]	- returns this message
 Example:
 	./skunkyart -c config.json
-Copyright lost+skunk, X11. https://git.macaw.me/skunky/skunkyart/src/tag/v1.3`
+Copyright lost+skunk, X11. https://git.macaw.me/skunky/skunkyart/src/tag/v1.3.1`
 	a := os.Args
 	for n, x := range a {
 	if CFG.cfg != "" {
 		f, err := os.ReadFile(CFG.cfg)
-		try_with_exitstatus(err, 1)
+		tryWithExitStatus(err, 1)
-		try_with_exitstatus(json.Unmarshal(f, &CFG), 1)
+		tryWithExitStatus(json.Unmarshal(f, &CFG), 1)
 		if CFG.Cache.Enabled && !CFG.Proxy {
 			exit("Incompatible settings detected: cannot use caching media content without proxy", 1)
 		}
-		if CFG.Cache.MaxSize != 0 || CFG.Cache.Lifetime != 0 {
+		if CFG.Cache.Enabled {
+			if CFG.Cache.Lifetime != "" {
+				var duration int64
+				day := 24 * time.Hour.Milliseconds()
+				numstr := regexp.MustCompile("[0-9]+").FindAllString(CFG.Cache.Lifetime, -1)
+				num, _ := strconv.Atoi(numstr[len(numstr)-1])
+				switch unit := CFG.Cache.Lifetime[len(CFG.Cache.Lifetime)-1:]; unit {
+				case "i":
+					duration = time.Minute.Milliseconds()
+				case "h":
+					duration = time.Hour.Milliseconds()
+				case "d":
+					duration = day
+				case "w":
+					duration = day * 7
+				case "m":
+					duration = day * 30
+				case "y":
+					duration = day * 360
+				default:
+					exit("Invalid unit specified: "+unit, 1)
+				}
+				lifetimeParsed = duration * int64(num)
+			}
+			CFG.Cache.MaxSize /= 1024 ^ 2
 			go InitCacheSystem()
 		}
+		devianter.UserAgent = CFG.UserAgent
 	}
 }

app/parsers.go +110 −103

	@@ -70,95 +70,100 @@ func (s skunkyart) ParseComments(c devianter.Comments) string {
70	return cmmts.String()	70	return cmmts.String()
71	}	71	}
72		72
73	func (s skunkyart) DeviationList(devs []devianter.Deviation, content ...DeviationList) string {	73	func (s skunkyart) DeviationList(devs []devianter.Deviation, allowAtom bool, content ...DeviationList) string {
74	var list strings.Builder
75	if s.Atom && s.Page > 1 {	74	if s.Atom && s.Page > 1 {
76	s.ReturnHTTPError(400)	75	s.ReturnHTTPError(400)
77	return ""	76	return ""
78	} else if s.Atom {
79	list.WriteString(`<?xml version="1.0" encoding="UTF-8"?><feed xmlns:media="http://search.yahoo.com/mrss/" xmlns="http://www.w3.org/2005/Atom">`)
80	list.WriteString(`<title>`)
81	if s.Type == 0 {
82	list.WriteString("Daily Deviations")
83	} else if len(devs) != 0 {
84	list.WriteString(devs[0].Author.Username)
85	} else {
86	list.WriteString("SkunkyArt")
87	}
88	list.WriteString(`</title>`)
89
90	list.WriteString(`<link rel="alternate" href="`)
91	list.WriteString(Host)
92	list.WriteString(`"/>`)
93	} else {
94	list.WriteString(`<div class="content">`)
95	}	77	}
96	for _, data := range devs {	78
97	if !(data.NSFW && !CFG.Nsfw) {	79	var list, listContent strings.Builder
98	url := ParseMedia(data.Media)	80
99	if s.Atom {	81	for i, l := 0, len(devs); i < l; i++ {
		82	data := &devs[i]
		83	if preview, fullview := ParseMedia(data.Media, 320), ParseMedia(data.Media); !(data.NSFW && !CFG.Nsfw) {
		84	if allowAtom && s.Atom {
100	id := strconv.Itoa(data.ID)	85	id := strconv.Itoa(data.ID)
101	list.WriteString(`<entry><author><name>`)	86	listContent.WriteString(`<entry><author><name>`)
102	list.WriteString(data.Author.Username)	87	listContent.WriteString(data.Author.Username)
103	list.WriteString(`</name></author><title>`)	88	listContent.WriteString(`</name></author><title>`)
104	list.WriteString(data.Title)	89	listContent.WriteString(data.Title)
105	list.WriteString(`</title><link rel="alternate" type="text/html" href="`)	90	listContent.WriteString(`</title><link rel="alternate" type="text/html" href="`)
106	list.WriteString(UrlBuilder("post", data.Author.Username, "atom-"+id))	91	listContent.WriteString(UrlBuilder("post", data.Author.Username, "atom-"+id))
107	list.WriteString(`"/><id>`)	92	listContent.WriteString(`"/><id>`)
108	list.WriteString(id)	93	listContent.WriteString(id)
109	list.WriteString(`</id><published>`)	94	listContent.WriteString(`</id><published>`)
110	list.WriteString(data.PublishedTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 -0700"))	95	listContent.WriteString(data.PublishedTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 -0700"))
111	list.WriteString(`</published>`)	96	listContent.WriteString(`</published>`)
112	list.WriteString(`<media:group><media:title>`)	97	listContent.WriteString(`<media:group><media:title>`)
113	list.WriteString(data.Title)	98	listContent.WriteString(data.Title)
114	list.WriteString(`</media:title><media:thumbinal url="`)	99	listContent.WriteString(`</media:title><media:thumbinal url="`)
115	list.WriteString(url)	100	listContent.WriteString(preview)
116	list.WriteString(`"/></media:group><content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><a href="`)	101	listContent.WriteString(`"/></media:group><content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><a href="`)
117	list.WriteString(ConvertDeviantArtUrlToSkunkyArt(data.Url))	102	listContent.WriteString(ConvertDeviantArtUrlToSkunkyArt(data.Url))
118	list.WriteString(`"><img src="`)	103	listContent.WriteString(`"><img src="`)
119	list.WriteString(url)	104	listContent.WriteString(fullview)
120	list.WriteString(`"/></a><p>`)	105	listContent.WriteString(`"/></a><p>`)
121	list.WriteString(ParseDescription(data.TextContent))	106	listContent.WriteString(ParseDescription(data.TextContent))
122	list.WriteString(`</p></div></content></entry>`)	107	listContent.WriteString(`</p></div></content></entry>`)
123	} else {	108	} else {
124	list.WriteString(`<div class="block">`)	109	listContent.WriteString(`<div class="block">`)
125	if url != "" {	110	if fullview != "" && preview != "" {
126	list.WriteString(`<a title="open/download" href="`)	111	listContent.WriteString(`<a title="open/download" href="`)
127	list.WriteString(url)	112	listContent.WriteString(fullview)
128	list.WriteString(`"><img loading="lazy" src="`)	113	listContent.WriteString(`"><img loading="lazy" src="`)
129	list.WriteString(url)	114	listContent.WriteString(preview)
130	list.WriteString(`" width="15%"></a>`)	115	listContent.WriteString(`" width="15%"></a>`)
131	} else {	116	} else {
132	list.WriteString(`<h1>[ TEXT ]</h1>`)	117	listContent.WriteString(`<h1>[ TEXT ]</h1>`)
133	}	118	}
134	list.WriteString(`<br><a href="`)	119	listContent.WriteString(`<br><a href="`)
135	list.WriteString(ConvertDeviantArtUrlToSkunkyArt(data.Url))	120	listContent.WriteString(ConvertDeviantArtUrlToSkunkyArt(data.Url))
136	list.WriteString(`">`)	121	listContent.WriteString(`">`)
137	list.WriteString(data.Author.Username)	122	listContent.WriteString(data.Author.Username)
138	list.WriteString(" - ")	123	listContent.WriteString(" - ")
139	list.WriteString(data.Title)	124	listContent.WriteString(data.Title)
140		125
141	// шильдики нсфв, аи и ежедневного поста
142	if data.NSFW {	126	if data.NSFW {
143	list.WriteString(` [<span class="nsfw">NSFW</span>]`)	127	listContent.WriteString(` [<span class="nsfw">NSFW</span>]`)
144	}	128	}
145	if data.AI {	129	if data.AI {
146	list.WriteString(" [🤖]")	130	listContent.WriteString(" [🤖]")
147	}	131	}
148	if data.DD {	132	if data.DD {
149	list.WriteString(` [<span class="dd">DD</span>]`)	133	listContent.WriteString(` [<span class="dd">DD</span>]`)
150	}	134	}
151		135
152	list.WriteString("</a></div>")	136	listContent.WriteString("</a></div>")
153	}	137	}
154	}	138	}
155	}	139	}
156		140
157	if s.Atom {	141	if allowAtom && s.Atom {
		142	list.WriteString(`<?xml version="1.0" encoding="UTF-8"?><feed xmlns:media="http://search.yahoo.com/mrss/" xmlns="http://www.w3.org/2005/Atom">`)
		143
		144	list.WriteString(`<title>`)
		145	if s.Type == 0 {
		146	list.WriteString("Daily Deviations")
		147	} else if s.Type == 'g' && len(devs) != 0 {
		148	list.WriteString(devs[0].Author.Username)
		149	} else {
		150	list.WriteString("SkunkyArt")
		151	}
		152	list.WriteString(`</title>`)
		153
		154	list.WriteString(`<link rel="alternate" href="`)
		155	list.WriteString(Host)
		156	list.WriteString(`"/>`)
		157
		158	list.WriteString(listContent.String())
		159
158	list.WriteString("</feed>")	160	list.WriteString("</feed>")
159	s.Writer.Write([]byte(list.String()))	161	wr(s.Writer, list.String())
160	return ""
161	} else {	162	} else {
		163	list.WriteString(`<div class="content">`)
		164
		165	list.WriteString(listContent.String())
		166
162	list.WriteString("</div>")	167	list.WriteString("</div>")
163	if content != nil {	168	if content != nil {
164	list.WriteString(s.NavBase(content[0]))	169	list.WriteString(s.NavBase(content[0]))
	@@ -177,7 +182,7 @@ type text struct {
177	}	182	}
178		183
179	func ParseDescription(dscr devianter.Text) string {	184	func ParseDescription(dscr devianter.Text) string {
180	var parseddescription strings.Builder	185	var parsedDescription strings.Builder
181	TagBuilder := func(content string, tags ...string) string {	186	TagBuilder := func(content string, tags ...string) string {
182	l := len(tags)	187	l := len(tags)
183	for x := 0; x < l; x++ {	188	for x := 0; x < l; x++ {
	@@ -274,16 +279,18 @@ func ParseDescription(dscr devianter.Text) string {
274		279
275	switch x.Type {	280	switch x.Type {
276	case "atomic":	281	case "atomic":
277	d := entities[x.EntityRanges[0].Key]	282	if len(x.EntityRanges) != 0 {
278	parseddescription.WriteString(`<a href="`)	283	d := entities[x.EntityRanges[0].Key]
279	parseddescription.WriteString(ConvertDeviantArtUrlToSkunkyArt(d.Url))	284	parsedDescription.WriteString(`<a href="`)
280	parseddescription.WriteString(`"><img width="50%" src="`)	285	parsedDescription.WriteString(ConvertDeviantArtUrlToSkunkyArt(d.Url))
281	parseddescription.WriteString(ParseMedia(d.Media))	286	parsedDescription.WriteString(`"><img width="50%" src="`)
282	parseddescription.WriteString(`" title="`)	287	parsedDescription.WriteString(ParseMedia(d.Media))
283	parseddescription.WriteString(d.Author.Username)	288	parsedDescription.WriteString(`" title="`)
284	parseddescription.WriteString(" - ")	289	parsedDescription.WriteString(d.Author.Username)
285	parseddescription.WriteString(d.Title)	290	parsedDescription.WriteString(" - ")
286	parseddescription.WriteString(`"></a>`)	291	parsedDescription.WriteString(d.Title)
		292	parsedDescription.WriteString(`"></a>`)
		293	}
287	case "unstyled":	294	case "unstyled":
288	if l := len(Styles); l != 0 {	295	if l := len(Styles); l != 0 {
289	for n, r := range Styles {	296	for n, r := range Styles {
	@@ -292,31 +299,31 @@ func ParseDescription(dscr devianter.Text) string {
292	tag = "h2"	299	tag = "h2"
293	}	300	}
294		301
295	parseddescription.WriteString(x.Text[:r.From])	302	parsedDescription.WriteString(x.Text[:r.From])
296	if len(urls) != 0 && len(x.EntityRanges) != 0 {	303	if len(urls) != 0 && len(x.EntityRanges) != 0 {
297	ra := &x.EntityRanges[0]	304	ra := &x.EntityRanges[0]
298		305
299	parseddescription.WriteString(`<a target="_blank" href="`)	306	parsedDescription.WriteString(`<a target="_blank" href="`)
300	parseddescription.WriteString(urls[ra.Key])	307	parsedDescription.WriteString(urls[ra.Key])
301	parseddescription.WriteString(`">`)	308	parsedDescription.WriteString(`">`)
302	parseddescription.WriteString(r.TXT)	309	parsedDescription.WriteString(r.TXT)
303	parseddescription.WriteString(`</a>`)	310	parsedDescription.WriteString(`</a>`)
304	} else if l > n+1 {	311	} else if l > n+1 {
305	parseddescription.WriteString(r.TXT)	312	parsedDescription.WriteString(r.TXT)
306	}	313	}
307	parseddescription.WriteString(TagBuilder(tag, x.Text[r.To:]))	314	parsedDescription.WriteString(TagBuilder(tag, x.Text[r.To:]))
308	}	315	}
309	} else {	316	} else {
310	parseddescription.WriteString(x.Text)	317	parsedDescription.WriteString(x.Text)
311	}	318	}
312	}	319	}
313	parseddescription.WriteString("<br>")	320	parsedDescription.WriteString("<br>")
314	}	321	}
315	} else if dl != 0 {	322	} else if dl != 0 {
316	for tt := html.NewTokenizer(strings.NewReader(dscr.Html.Markup)); ; {	323	for tt := html.NewTokenizer(strings.NewReader(dscr.Html.Markup)); ; {
317	switch tt.Next() {	324	switch tt.Next() {
318	case html.ErrorToken:	325	case html.ErrorToken:
319	return parseddescription.String()	326	return parsedDescription.String()
320	case html.StartTagToken, html.EndTagToken, html.SelfClosingTagToken:	327	case html.StartTagToken, html.EndTagToken, html.SelfClosingTagToken:
321	token := tt.Token()	328	token := tt.Token()
322	switch token.Data {	329	switch token.Data {
	@@ -324,11 +331,11 @@ func ParseDescription(dscr devianter.Text) string {
324	for _, a := range token.Attr {	331	for _, a := range token.Attr {
325	if a.Key == "href" {	332	if a.Key == "href" {
326	url := DeleteTrackingFromUrl(a.Val)	333	url := DeleteTrackingFromUrl(a.Val)
327	parseddescription.WriteString(`<a target="_blank" href="`)	334	parsedDescription.WriteString(`<a target="_blank" href="`)
328	parseddescription.WriteString(url)	335	parsedDescription.WriteString(url)
329	parseddescription.WriteString(`">`)	336	parsedDescription.WriteString(`">`)
330	parseddescription.WriteString(GetValueOfTag(tt))	337	parsedDescription.WriteString(GetValueOfTag(tt))
331	parseddescription.WriteString("</a> ")	338	parsedDescription.WriteString("</a> ")
332	}	339	}
333	}	340	}
334	case "img":	341	case "img":
	@@ -344,24 +351,24 @@ func ParseDescription(dscr devianter.Text) string {
344	}	351	}
345	if title != "" {	352	if title != "" {
346	for x := -1; x < b; x++ {	353	for x := -1; x < b; x++ {
347	parseddescription.WriteString(`<img src="`)	354	parsedDescription.WriteString(`<img src="`)
348	parseddescription.WriteString(uri)	355	parsedDescription.WriteString(uri)
349	parseddescription.WriteString(`" title="`)	356	parsedDescription.WriteString(`" title="`)
350	parseddescription.WriteString(title)	357	parsedDescription.WriteString(title)
351	parseddescription.WriteString(`">`)	358	parsedDescription.WriteString(`">`)
352	}	359	}
353	}	360	}
354	}	361	}
355	case "br", "li", "ul", "p", "b":	362	case "br", "li", "ul", "p", "b":
356	parseddescription.WriteString(token.String())	363	parsedDescription.WriteString(token.String())
357	case "div":	364	case "div":
358	parseddescription.WriteString("<p> ")	365	parsedDescription.WriteString("<p> ")
359	}	366	}
360	case html.TextToken:	367	case html.TextToken:
361	parseddescription.Write(tt.Text())	368	parsedDescription.Write(tt.Text())
362	}	369	}
363	}	370	}
364	}	371	}
365		372
366	return parseddescription.String()	373	return parsedDescription.String()
367	}	374	}

app/router.go +7 −4

 package app
 import (
-	"io"
 	"net/http"
 	u "net/url"
 	"strconv"
 	// функция, что управляет всем
 	handle := func(w http.ResponseWriter, r *http.Request) {
-		if h := r.Header["Scheme"]; len(h) != 0 && h[0] == "https" {
+		if h := r.Header["X-Forwarded-Proto"]; len(h) != 0 && h[0] == "https" {
 			Host = h[0] + "://" + r.Host
 		} else {
 			Host = "http://" + r.Host
 			skunky.About()
 		case "stylesheet":
 			w.Header().Add("content-type", "text/css")
-			io.WriteString(w, Templates["skunky.css"])
+			wr(w, Templates["skunky.css"])
+		case "favicon.ico":
+			wr(w, Templates["logo.png"])
 		}
 	}
 	http.HandleFunc("/", handle)
-	try_with_exitstatus(http.ListenAndServe(CFG.Listen, nil), 1)
+	println("SkunkyArt is listening on", CFG.Listen)
+	tryWithExitStatus(http.ListenAndServe(CFG.Listen, nil), 1)
 }

app/util.go +22 −32

 		println(e.Error())
 	}
 }
-func try_with_exitstatus(err error, code int) {
+func tryWithExitStatus(err error, code int) {
 	if err != nil {
 		exit(err.Error(), code)
 	}
 	req, e := http.NewRequest("GET", url, nil)
 	try(e)
-	req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0.0")
+	req.Header.Set("User-Agent", CFG.UserAgent)
 	resp, e := cli.Do(req)
 	try(e)
 		try(e)
 		for _, a := range dirnames {
 			a = c.Path + "/" + a
-			if c.Lifetime != 0 {
+			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+c.Lifetime <= now {
+				if time+lifetimeParsed <= now {
 					try(os.RemoveAll(a))
 				}
 			}
 func CopyTemplatesToMemory() {
 	for _, dirname := range CFG.Dirs {
 		dir, e := os.ReadDir(dirname)
-		try_with_exitstatus(e, 1)
+		tryWithExitStatus(e, 1)
 		for _, x := range dir {
 			file, e := os.ReadFile(dirname + "/" + x.Name())
-			try_with_exitstatus(e, 1)
+			tryWithExitStatus(e, 1)
 			Templates[x.Name()] = string(file)
 		}
 	}
 }
 /* PARSING HELPERS */
-func ParseMedia(media devianter.Media) string {
+func ParseMedia(media devianter.Media, thumb ...int) string {
-	url := devianter.UrlFromMedia(media)
+	url := devianter.UrlFromMedia(media, thumb...)
 	if len(url) != 0 && CFG.Proxy {
 		url = url[21:]
 		dot := strings.Index(url, ".")
 func ConvertDeviantArtUrlToSkunkyArt(url string) (output string) {
 	if len(url) > 32 && url[27:32] != "stash" {
 		url = url[27:]
-		toart := strings.Index(url, "/art/")
+		firstshash := strings.Index(url, "/")
-		if toart != -1 {
+		lastshash := firstshash + strings.Index(url[firstshash+1:], "/")
-			output = UrlBuilder("post", url[:toart], url[toart+5:])
+		if lastshash != -1 {
+			output = UrlBuilder("post", url[:firstshash], url[lastshash+2:])
 		}
 	}
 	return
 // FIXME: на некоротрых артах первая страница может вызывать полное отсутствие панели навигации.
 func (s skunkyart) NavBase(c DeviationList) string {
-	// TODO: сделать понятнее
-	// навигация по страницам
 	var list strings.Builder
-	list.WriteString("<br>")
-	p := s.Page
-	// функция для генерации ссылок
+	list.WriteString("<br>")
 	prevrev := func(msg string, page int, onpage bool) {
 		if !onpage {
 			list.WriteString(`<a href="?p=`)
 		}
 	}
-	// вперёд-назад
+	p := s.Page
 	if p > 1 {
 		prevrev("<= Prev |", p-1, false)
 	} else {
 		p = 1
 	}
-	if c.Pages > 0 {
+	for i, x := p-6, 0; (i <= c.Pages && i <= p+6) && x < 12; i++ {
-		// назад
+		if i > 0 {
-		for x := p - 6; x < p && x > 0; x++ {
+			var onPage bool
-			prevrev(strconv.Itoa(x), x, false)
+			if i == p {
-		}
+				onPage = true
-		// вперёд
-		for x := p; x <= p+6 && c.Pages > p+6; x++ {
-			if x == p {
-				prevrev("", x, true)
-				x++
 			}
-			if x > p {
+			prevrev(strconv.Itoa(i), i, onPage)
-				prevrev(strconv.Itoa(x), x, false)
+			x++
-			}
 		}
 	}
-	// вперёд-назад
 	if c.More {
 		prevrev("| Next =>", p+1, false)
 	}

app/wrapper.go +35 −16

 		}
 		SomeList  string
+		DDStrips  string
 		Deviation struct {
 			Post       devianter.Post
 			Related    string
 	var g devianter.Group
 	g.Name = s.Query
-	s.Templates.GroupUser.GR = g.GroupFunc()
+	var err error
+	s.Templates.GroupUser.GR, err = g.GetGroup()
+	try(err)
 	group := &s.Templates.GroupUser
 	switch s.Type {
 						group.About.Interests += interest.String()
 					}
 				}
-				group.About.Comments = s.ParseComments(devianter.CommentsFunc(
+				group.About.Comments = s.ParseComments(devianter.GetComments(
 					strconv.Itoa(group.GR.Gruser.ID),
 					"",
 					s.Page,
 			s.Page++
 		}
-		gallery := g.Gallery(s.Page, folderid)
+		gallery, err := g.GetGallery(s.Page, folderid)
+		try(err)
 		if folderid > 0 {
-			group.Gallery.List = s.DeviationList(gallery.Content.Results, DeviationList{
+			group.Gallery.List = s.DeviationList(gallery.Content.Results, true, DeviationList{
 				More: gallery.Content.HasMore,
 			})
 		} else {
 				}
 				if x.Name == "folder_deviations" {
-					group.Gallery.List = s.DeviationList(x.ModuleData.Folder.Deviations, DeviationList{
+					group.Gallery.List = s.DeviationList(x.ModuleData.Folder.Deviations, true, DeviationList{
 						Pages: x.ModuleData.Folder.Pages,
 						More:  x.ModuleData.Folder.HasMore,
 					})
 		post := &s.Templates.Deviation
 		id := id_search[len(id_search)-1]
-		post.Post = devianter.DeviationFunc(id, author)
+		post.Post = devianter.GetDeviation(id, author)
 		if post.Post.Deviation.TextContent.Excerpt != "" {
 			post.Post.Description = ParseDescription(post.Post.Deviation.TextContent)
 		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)
+				post.Related += s.DeviationList(x.Deviations, false)
 			}
 		}
 			post.Post.Comments.Cursor = ""
 		}
-		post.Comments = s.ParseComments(devianter.CommentsFunc(id, post.Post.Comments.Cursor, s.Page, 1))
+		post.Comments = s.ParseComments(devianter.GetComments(id, post.Post.Comments.Cursor, s.Page, 1))
 		s.ExecuteTemplate("deviantion.htm", &s)
 	} else {
 }
 func (s skunkyart) DD() {
-	dd := devianter.DailyDeviationsFunc(s.Page)
+	dd := devianter.GetDailyDeviations(s.Page)
-	s.Templates.SomeList = s.DeviationList(dd.Deviations, DeviationList{
+	var strips strings.Builder
+	for _, x := range dd.Strips {
+		strips.WriteString(`<h3 class="`)
+		strips.WriteString(x.Codename)
+		strips.WriteString(`"> <a href="#`)
+		strips.WriteString(x.Codename)
+		strips.WriteString(`"># </a>`)
+		strips.WriteString(x.Title)
+		strips.WriteString(`</h3>`)
+		strips.WriteString(s.DeviationList(x.Deviations, false))
+	}
+	s.Templates.DDStrips = strips.String()
+	s.Templates.SomeList = s.DeviationList(dd.Deviations, true, DeviationList{
 		Pages: 0,
 		More:  dd.HasMore,
 	})
 	if !s.Atom {
-		s.ExecuteTemplate("list.htm", &s)
+		s.ExecuteTemplate("daily.htm", &s)
 	}
 }
 func (s skunkyart) Search() {
 	s.Atom = false
-	var e error
+	var err error
 	ss := &s.Templates.Search
 	switch s.Type {
 	case 'a', 't':
-		ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type)
+		ss.Content, err = devianter.PerformSearch(s.Query, s.Page, s.Type)
 	case 'g':
-		ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type, s.Args.Get("usr"))
+		ss.Content, err = devianter.PerformSearch(s.Query, s.Page, s.Type, s.Args.Get("usr"))
 	case 'r': // скраппер, поскольку девиантартовцы зажопили гостевое API для поиска групп
 		var (
 			usernames = make(map[int]string)
 	default:
 		s.ReturnHTTPError(400)
 	}
-	try(e)
+	try(err)
 	if s.Type != 'r' {
-		ss.List = s.DeviationList(ss.Content.Results, DeviationList{
+		ss.List = s.DeviationList(ss.Content.Results, false, DeviationList{
 			Pages: ss.Content.Pages,
 			More:  ss.Content.HasMore,
 		})

config.example.json +6 −4

     "cache": {
         "enabled": true,
         "path": "/home/skunk/projects/skunkyart/cache",
-        "lifetime": null,
+        "lifetime": "1w",
-        "max-size": 100000,
+        "max-size": 1024,
         "update-interval": 5
     },
     "dirs-to-memory": [
         "/home/skunk/projects/skunkyart/html",
-        "/home/skunk/projects/skunkyart/css"
+        "/home/skunk/projects/skunkyart/css",
+        "/home/skunk/projects/skunkyart/misc"
     ],
-    "download-proxy": null,
+    "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": false
 }

css/skunky.css +43 −7

	@@ -131,28 +131,64 @@ form input, button, select {
131	}	131	}
132		132
133	/* SCREEN OPTIMISATIONS */	133	/* SCREEN OPTIMISATIONS */
134	@media screen and (orientation: portrait) {	134	@media (orientation: portrait) {
135	header {	135	* {
136	scale: 155%;	136	font-size: 120%
137	justify-content: center;
138	}	137	}
		138
		139	ul {
		140	font-size: 80%
		141	}
		142
		143	center form {
		144	font-size: 60%
		145	}
		146
		147	header form {
		148	font-size: 60%;
		149	}
		150	header, center {
		151	text-align: center;
		152	display: block;
		153	clear: both;
		154	font-size: 200%;
		155	}
		156
139	.content {	157	.content {
140	margin: auto;	158	margin: auto;
141	display: inherit;	159	display: inherit;
142	scale: 100%;	160	scale: 100%;
143	}	161	}
144	.block {	162	.block {
145	max-width: 60%;	163	margin-top: 10%;
		164	max-width: 200%;
		165	}
		166	.folder-item {
		167	width: 25%
		168	}
		169	.folders {
		170	display: flexbox;
		171	justify-content: center
		172	}
		173	figure img {
		174	width: 10%
		175	}
		176	figure a img {
		177	width: 100%
		178	}
		179	.msg {
		180	font-size: 60%;
		181	max-width: 80%
146	}	182	}
147	}	183	}
148		184
149	@media screen and (max-width: 1462px) {	185	@media (max-width: 1462px) and (orientation: landscape) {
150	.block {	186	.block {
151	max-width: 30%;	187	max-width: 30%;
152	}	188	}
153	}	189	}
154		190
155	@media screen and (min-width: 788px) and (max-width: 884px) {	191	@media (min-width: 788px) and (max-width: 884px) {
156	.block {	192	.block {
157	max-width: 35%;	193	max-width: 35%;
158	}	194	}

go.mod +2

	@@ -2,6 +2,8 @@ module skunkyart
2		2
3	go 1.22.3	3	go 1.22.3
4		4
		5	replace git.macaw.me/skunky/devianter v0.2.0 => /home/skunk/projects/devianter
		6
5	require (	7	require (
6	git.macaw.me/skunky/devianter v0.2.0	8	git.macaw.me/skunky/devianter v0.2.0
7	golang.org/x/net v0.27.0	9	golang.org/x/net v0.27.0

html/about.htm +1 −1

	@@ -58,6 +58,6 @@
58	</li>	58	</li>
59	{{end}}	59	{{end}}
60	</ul>	60	</ul>
61	<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/v1.3" target="_blank">SkunkyArt v1.3</a></p>	61	<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/v1.3.1" target="_blank">SkunkyArt v1.3.1</a></p>
62	</main>	62	</main>
63	</html>\ No newline at end of file	63	</html>\ No newline at end of file

html/list.htm → html/daily.htm renamed +6 −1

 <!DOCTYPE html>
 <html>
     <head>
-        <title>SkunkyArt</title>
+        <title>SkunkyArt | Daily Deviations</title>
         <link rel="stylesheet" href="{{.BasePath}}stylesheet">
     </head>
     <main>
                 <button type="submit">Search!</button>
             </form>
         </header>
+        {{if ne .Templates.DDStrips ""}}
+        <h2 id="strips"><a href="#strips">#</a> Strips</h2>
+        {{.Templates.DDStrips}}
+        {{end}}
+        <h2 id="content"><a href="#content">#</a> Content</h2>
         {{.Templates.SomeList}}
     </main>
 </html>\ No newline at end of file

instances.json +11

	@@ -44,6 +44,17 @@
44	"nsfw": true,	44	"nsfw": true,
45	"proxy": true	45	"proxy": true
46	}	46	}
		47	},
		48	{
		49	"title": "lumaeris.com",
		50	"country": "US",
		51	"urls": [{
		52	"clearnet": "https://skunkyart.lumaeris.com"
		53	}],
		54	"settings": {
		55	"nsfw": true,
		56	"proxy": true
		57	}
47	}	58	}
48	]	59	]
49	}\ No newline at end of file	60	}\ No newline at end of file

misc/logo.png added

Binary file not shown.

services/skunkyart.example.openrc added +13

@@ -0,0 +1,13 @@
	1	#!/sbin/openrc-run
	2
	3	directory=<path_to_dir_with_skunkyart>
	4	# command_args="-c $directory/config.json" # if SA wasn't start, try to uncomment this line
	5	command=$directory/skunkyart
	6
	7	name="SkunkyArt"
	8	description="Privacy frontend for deviantart.com"
	9	supervisor=supervise-daemon
	10
	11	depend() {
	12	need net
	13	}\ No newline at end of file

services/skunkyart.example.service added +11

@@ -0,0 +1,11 @@
	1	# Note: i didn't use systemd, so it can be not works :)
	2
	3	[Unit]
	4	Description=Privacy frontend for deviantart.com
	5
	6	[Service]
	7	Directory=<path-to-dir-with-skunkyart>
	8	ExecStart=<path-to-dir-skunkyart>
	9
	10	[Install]
	11	WantedBy=multi-user.target

skunkyart.example.openrc deleted −11

	@@ -1,11 +0,0 @@
1	#!/sbin/openrc-run
2	name="SkunkyArt"
3	description="Privacy frontend for deviantart.com"
4	supervisor=supervise-daemon
5	command=<path_to_skunkyart>
6	command_args="-c <path_to_config>"
7	directory="<path_to_dir_with_skunkyart>"
8
9	depend() {
10	need net
11	}\ No newline at end of file

Commit 2dfeaae772

Commit `2dfeaae772`