1537da9b16 · krz/skunky-art

README.md +4 −4

SETUP-RU.md +1 −1

	@@ -1,4 +1,4 @@
1	[English version 🇬🇧](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/SETUP.md)	1	[English version 🇬🇧](/skunky/SkunkyArt/src/branch/master/SETUP.md)
2		2
3	# Единицы измерения	3	# Единицы измерения
4	Размер файла в кеше измеряется в мегабайтах.<br>	4	Размер файла в кеше измеряется в мегабайтах.<br>

SETUP.md +1 −1

	@@ -1,4 +1,4 @@
1	[Версия на русском языке 🇷🇺](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/SETUP-RU.md)	1	[Версия на русском языке 🇷🇺](/skunky/SkunkyArt/src/branch/master/SETUP-RU.md)
2		2
3	# Units	3	# Units
4	Maximum file size in megabytes, requires numeric value.<br>	4	Maximum file size in megabytes, requires numeric value.<br>

TODO.md +10 −8

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

app/cache.go added +132

@@ -0,0 +1,132 @@
	1	// TODO: реализовать кеширование JSON и почистить код
	2	package app
	3
	4	import (
	5	"crypto/sha1"
	6	"encoding/hex"
	7	"io"
	8	"os"
	9	"strings"
	10	"sync"
	11	"syscall"
	12	"time"
	13	)
	14
	15	type file struct {
	16	Score int
	17	Content []byte
	18	}
	19
	20	var tempFS = make(map[[20]byte]*file)
	21	var mx = &sync.RWMutex{}
	22
	23	func (s skunkyart) DownloadAndSendMedia(subdomain, path string) {
	24	var url strings.Builder
	25	url.WriteString("https://images-wixmp-")
	26	url.WriteString(subdomain)
	27	url.WriteString(".wixmp.com/")
	28	url.WriteString(path)
	29	url.WriteString("?token=")
	30	url.WriteString(s.Args.Get("token"))
	31
	32	var response []byte
	33
	34	switch {
	35	case CFG.Cache.Enabled:
	36	fileName := sha1.Sum([]byte(subdomain + path))
	37	filePath := CFG.Cache.Path + "/" + hex.EncodeToString(fileName[:])
	38
	39	mx.Lock()
	40	if tempFS[fileName] == nil {
	41	tempFS[fileName] = &file{}
	42	}
	43	f := *tempFS[fileName]
	44	mx.Unlock()
	45
	46	if f.Content != nil {
	47	f.Score += 2
	48	} else {
	49	file, err := os.Open(filePath)
	50	if err != nil {
	51	if dwnld := Download(url.String()); dwnld.Status == 200 && dwnld.Headers["Content-Type"][0][:5] == "image" {
	52	f.Content = dwnld.Body
	53	try(os.WriteFile(filePath, f.Content, 0700))
	54	} else {
	55	s.ReturnHTTPError(dwnld.Status)
	56	return
	57	}
	58	} else {
	59	file, e := io.ReadAll(file)
	60	try(e)
	61	f.Content = file
	62	}
	63
	64	go func() {
	65	defer restore()
	66	for {
	67	time.Sleep(1 * time.Minute)
	68
	69	mx.Lock()
	70	if tempFS[fileName].Score <= 0 {
	71	delete(tempFS, fileName)
	72	mx.Unlock()
	73	return
	74	}
	75	tempFS[fileName].Score--
	76	mx.Unlock()
	77	}
	78	}()
	79	}
	80
	81	mx.Lock()
	82	tempFS[fileName] = &f
	83	mx.Unlock()
	84	response = f.Content
	85	case CFG.Proxy:
	86	dwnld := Download(url.String())
	87	if dwnld.Status != 200 {
	88	s.ReturnHTTPError(dwnld.Status)
	89	return
	90	}
	91	response = dwnld.Body
	92	default:
	93	s.Writer.WriteHeader(403)
	94	response = []byte("Sorry, butt proxy on this instance are disabled.")
	95	}
	96
	97	s.Writer.Write(response)
	98	}
	99
	100	func InitCacheSystem() {
	101	c := &CFG.Cache
	102	os.Mkdir(c.Path, 0700)
	103	for {
	104	dir, e := os.Open(c.Path)
	105	try(e)
	106	stat, e := dir.Stat()
	107	try(e)
	108
	109	dirnames, e := dir.Readdirnames(-1)
	110	try(e)
	111	for _, a := range dirnames {
	112	a = c.Path + "/" + a
	113	if c.Lifetime != "" {
	114	now := time.Now().UnixMilli()
	115
	116	f, _ := os.Stat(a)
	117	stat := f.Sys().(*syscall.Stat_t)
	118	time := statTime(stat)
	119
	120	if time+lifetimeParsed <= now {
	121	try(os.RemoveAll(a))
	122	}
	123	}
	124	if c.MaxSize != 0 && stat.Size() > c.MaxSize {
	125	try(os.RemoveAll(a))
	126	}
	127	}
	128
	129	dir.Close()
	130	time.Sleep(time.Second * time.Duration(c.UpdateInterval))
	131	}
	132	}

app/cli.go +29 −34

	@@ -78,16 +78,16 @@ func addInstance() {
78	try(err)	78	try(err)
79	defer instancesJson.Close()	79	defer instancesJson.Close()
80		80
81	instances, err := os.OpenFile("INSTANCES.md", os.O_APPEND\|os.O_CREATE\|os.O_WRONLY, 0644)	81	instancesFile, err := os.OpenFile("INSTANCES.md", os.O_APPEND\|os.O_CREATE\|os.O_WRONLY, 0644)
82	try(err)	82	try(err)
83	defer instances.Close()	83	defer instancesFile.Close()
84		84
85	for {	85	for {
86	if Templates["instances.json"] == "" {	86	if string(instances) == "" {
87	print("\rDownloading instance list...")	87	print("\rDownloading instance list...")
88	} else {	88	} else {
89	println("\r\033[2KDownloaded!")	89	println("\r\033[2KDownloaded!")
90	try(json.Unmarshal([]byte(Templates["instances.json"]), &settingsVar))	90	try(json.Unmarshal(instances, &settingsVar))
91		91
92	settingsVar.Instances = append(settingsVar.Instances, settings{	92	settingsVar.Instances = append(settingsVar.Instances, settings{
93	Title: prompt("Title", true),	93	Title: prompt("Title", true),
	@@ -113,51 +113,46 @@ func addInstance() {
113	settingsVar := &settingsVar.Instances[len(settingsVar.Instances)-1]	113	settingsVar := &settingsVar.Instances[len(settingsVar.Instances)-1]
114	var mdstr bytes.Buffer	114	var mdstr bytes.Buffer
115		115
116	mdstr.WriteString("\n\|")	116	mdbuilder := func(yes bool, link string, title string) {
117	if settingsVar.Urls.Clearnet != "" {	117	switch {
118	mdstr.WriteString("[")	118	case yes && (title != "" && link != ""):
119	mdstr.WriteString(settingsVar.Title)	119	mdstr.WriteString("[")
120	mdstr.WriteString("](")	120	mdstr.WriteString(title)
121	mdstr.WriteString(settingsVar.Urls.Clearnet)	121	mdstr.WriteString("](")
122	mdstr.WriteString(")")	122	mdstr.WriteString(link)
123	} else {	123	mdstr.WriteString(")")
124	mdstr.WriteString(settingsVar.Title)	124	case yes && link != "":
		125	mdstr.WriteString("[Yes](")
		126	mdstr.WriteString(link)
		127	mdstr.WriteString(")")
		128	case yes:
		129	mdstr.WriteString("Yes")
		130	default:
		131	mdstr.WriteString("No")
		132	}
		133	mdstr.WriteString("\|")
125	}	134	}
126	mdstr.WriteString("\|")	135
		136	mdstr.WriteString("\n\|")
		137	mdbuilder(settingsVar.Urls.Clearnet != "", settingsVar.Urls.Clearnet, settingsVar.Title)
127		138
128	urls := []string{settingsVar.Urls.Ygg, settingsVar.Urls.I2P, settingsVar.Urls.Tor}	139	urls := []string{settingsVar.Urls.Ygg, settingsVar.Urls.I2P, settingsVar.Urls.Tor}
129	for i, l := 0, len(urls); i < l; i++ {	140	for i, l := 0, len(urls); i < l; i++ {
130	url := urls[i]	141	url := urls[i]
131	if url != "" {	142	mdbuilder(url != "", url, "")
132	mdstr.WriteString("[Yes](")
133	mdstr.WriteString(url)
134	mdstr.WriteString(")\|")
135	} else {
136	mdstr.WriteString("No\|")
137	}
138	}	143	}
139		144
140	settings := []bool{settingsVar.Settings.Nsfw, settingsVar.Settings.Proxy}	145	settings := []bool{settingsVar.Settings.Nsfw, settingsVar.Settings.Proxy}
141	for i, l := 0, len(settings); i < l; i++ {	146	for i, l := 0, len(settings); i < l; i++ {
142	if settings[i] {	147	mdbuilder(settings[i], "", "")
143	mdstr.WriteString("Yes\|")
144	} else {
145	mdstr.WriteString("No\|")
146	}
147	}	148	}
148		149
149	if settingsVar.ModifiedSrc != "" {	150	mdbuilder(settingsVar.ModifiedSrc != "", settingsVar.ModifiedSrc, "")
150	mdstr.WriteString("[Yes](")
151	mdstr.WriteString(settingsVar.ModifiedSrc)
152	mdstr.WriteString(")\|")
153	} else {
154	mdstr.WriteString("No\|")
155	}
156		151
157	mdstr.WriteString(settingsVar.Country)	152	mdstr.WriteString(settingsVar.Country)
158	mdstr.WriteString("\|")	153	mdstr.WriteString("\|")
159		154
160	instances.Write(mdstr.Bytes())	155	instancesFile.Write(mdstr.Bytes())
161	break	156	break
162	}	157	}
163	time.Sleep(500 * time.Millisecond)	158	time.Sleep(500 * time.Millisecond)

app/config.go +9 −7

 	"encoding/json"
 	"os"
 	"regexp"
+	"skunkyart/static"
 	"strconv"
 	"time"
 	URI           string `json:"uri"`
 	Cache         cache_config
 	Proxy, Nsfw   bool
-	UserAgent     string   `json:"user-agent"`
+	UserAgent     string `json:"user-agent"`
-	DownloadProxy string   `json:"download-proxy"`
+	DownloadProxy string `json:"download-proxy"`
-	Dirs          []string `json:"dirs-to-memory"`
+	StaticPath    string `json:"static-path"`
 }
 var CFG = config{
 		Path:           "cache",
 		UpdateInterval: 1,
 	},
-	Dirs:      []string{"html", "css", "misc"},
+	StaticPath: "static",
-	UserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
+	UserAgent:  "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,
+	Proxy:      true,
-	Nsfw:      true,
+	Nsfw:       true,
 }
 var lifetimeParsed int64
 			exit("Incompatible settings detected: cannot use caching media content without proxy", 1)
 		}
+		static.StaticPath = CFG.StaticPath
 		if CFG.Cache.Enabled {
 			if CFG.Cache.Lifetime != "" {
 				var duration int64

app/parsers.go +5 −3

 		cmmts.WriteString("</b></a> ")
 		if x.Parent > 0 {
-			cmmts.WriteString(` In reply to <a href="#`)
+			cmmts.WriteString(` In reply to <a href="`)
+			cmmts.WriteString(Path)
+			cmmts.WriteString("#")
 			cmmts.WriteString(strconv.Itoa(x.Parent))
 			cmmts.WriteString(`">`)
 			if replied[x.Parent] == "" {
 	for i, l := 0, len(devs); i < l; i++ {
 		data := &devs[i]
-		if preview, fullview := ParseMedia(data.Media, 320), ParseMedia(data.Media); !(data.NSFW && !CFG.Nsfw) {
+		if preview, fullview := ParseMedia(data.Media, data.Title, 320), ParseMedia(data.Media, data.Title); !(data.NSFW && !CFG.Nsfw) {
 			if allowAtom && s.Atom {
 				id := strconv.Itoa(data.ID)
 				listContent.WriteString(`<entry><author><name>`)
 					parsedDescription.WriteString(`<a href="`)
 					parsedDescription.WriteString(ConvertDeviantArtUrlToSkunkyArt(d.Url))
 					parsedDescription.WriteString(`"><img width="50%" src="`)
-					parsedDescription.WriteString(ParseMedia(d.Media))
+					parsedDescription.WriteString(ParseMedia(d.Media, d.Title))
 					parsedDescription.WriteString(`" title="`)
 					parsedDescription.WriteString(d.Author.Username)
 					parsedDescription.WriteString(" - ")

app/router.go +27 −6

 package app
 import (
+	"io"
 	"net/http"
 	u "net/url"
+	"skunkyart/static"
 	"strconv"
 	"strings"
 )
-var Host string
+var Host, Path string
 func Router() {
 	parsepath := func(path string) map[int]string {
 		return
 	}
+	open := func(name string) []byte {
+		file, err := static.Templates.Open(name)
+		try(err)
+		fileReaded, err := io.ReadAll(file)
+		try(err)
+		return fileReaded
+	}
 	// функция, что управляет всем
 	handle := func(w http.ResponseWriter, r *http.Request) {
 		if h := r.Header["X-Forwarded-Proto"]; len(h) != 0 && h[0] == "https" {
 			Host = "http://" + r.Host
 		}
-		path := parsepath(r.URL.Path)
+		Path = r.URL.Path
+		path := parsepath(Path)
 		// структура с функциями
 		var skunky skunkyart
 		skunky.Writer = w
 			skunky.Atom = true
 		}
+		skunky.Endpoint = path[1]
 		// пути
-		switch path[1] {
+		switch skunky.Endpoint {
 		default:
 			skunky.ReturnHTTPError(404)
 		case "":
-			skunky.ExecuteTemplate("index.htm", &CFG.URI)
+			w.Write(open("html/index.htm"))
 		case "post":
 			skunky.Deviation(path[2], path[3])
 		case "search":
 		case "media":
 			switch path[2] {
 			case "file":
+				if a := arg("filename"); a != "" {
+					var filename strings.Builder
+					filename.WriteString(`filename="`)
+					filename.WriteString(a)
+					filename.WriteString(`"`)
+					w.Header().Add("Content-Disposition", filename.String())
+				}
 				skunky.DownloadAndSendMedia(path[3], next(path, 4))
 			case "emojitar":
 				skunky.Emojitar(path[3])
 			skunky.About()
 		case "stylesheet":
 			w.Header().Add("content-type", "text/css")
-			wr(w, Templates["skunky.css"])
+			w.Write(open("css/skunky.css"))
 		case "favicon.ico":
-			wr(w, Templates["logo.png"])
+			w.Write(open("images/logo.png"))
 		}
 	}

app/stat-freebsd.go added +13

@@ -0,0 +1,13 @@
	1	//go:build freebsd
	2	// +build freebsd
	3
	4	package app
	5
	6	import (
	7	"syscall"
	8	"time"
	9	)
	10
	11	func statTime(stat *syscall.Stat_t) int64 {
	12	return time.Unix(stat.Ctimespec.Unix()).UnixMilli()
	13	}

app/stat.go added +13

@@ -0,0 +1,13 @@
	1	//go:build !freebsd
	2	// +build !freebsd
	3
	4	package app
	5
	6	import (
	7	"syscall"
	8	"time"
	9	)
	10
	11	func statTime(stat *syscall.Stat_t) int64 {
	12	return time.Unix(stat.Ctim.Unix()).UnixMilli()
	13	}

app/util.go +32 −104

 package app
 import (
-	"encoding/base64"
 	"io"
 	"net/http"
-	u "net/url"
+	"net/url"
 	"os"
+	"skunkyart/static"
 	"strconv"
 	"strings"
-	"syscall"
 	"text/template"
 	"time"
 	}
 }
+func restore() {
+	if r := recover(); r != nil {
+		recover()
+	}
+}
+var instances []byte
 func RefreshInstances() {
 	for {
 		func() {
-			defer func() {
+			defer restore()
-				if r := recover(); r != nil {
+			instances = Download("https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/instances.json").Body
-					recover()
-				}
-			}()
-			Templates["instances.json"] = string(Download("https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/instances.json").Body)
 		}()
 		time.Sleep(1 * time.Hour)
 	}
 }
 // some crap for frontend
-func (s skunkyart) ExecuteTemplate(file string, data any) {
+func (s skunkyart) ExecuteTemplate(file, dir string, data any) {
 	var buf strings.Builder
 	tmp := template.New(file)
-	tmp, e := tmp.Parse(Templates[file])
+	tmp, err := tmp.ParseFS(static.Templates, dir+"/*")
-	try(e)
+	if err != nil {
+		s.Writer.WriteHeader(500)
+		wr(s.Writer, err.Error())
+		return
+	}
 	try(tmp.Execute(&buf, &data))
 	wr(s.Writer, buf.String())
 }
 	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)
 	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 {
+func ParseMedia(media devianter.Media, filename string, thumb ...int) string {
-	url := devianter.UrlFromMedia(media, thumb...)
+	mediaUrl := devianter.UrlFromMedia(media, thumb...)
-	if len(url) != 0 && CFG.Proxy {
+	if len(mediaUrl) != 0 && CFG.Proxy {
-		url = url[21:]
+		mediaUrl = mediaUrl[21:]
-		dot := strings.Index(url, ".")
+		dot := strings.Index(mediaUrl, ".")
-		return UrlBuilder("media", "file", url[:dot], url[dot+11:])
+		return UrlBuilder("media", "file", mediaUrl[:dot], mediaUrl[dot+11:], "&filename=", url.QueryEscape(filename))
 	}
-	return url
+	return mediaUrl
 }
 func ConvertDeviantArtUrlToSkunkyArt(url string) (output string) {
 	list.WriteString("<br>")
 	prevrev := func(msg string, page int, onpage bool) {
 		if !onpage {
-			list.WriteString(`<a href="?p=`)
+			list.WriteString(`<a href="`)
+			list.WriteString(Path)
+			list.WriteString(`?p=`)
 			list.WriteString(strconv.Itoa(page))
 			if s.Type != 0 {
 				list.WriteString("&type=")

app/wrapper.go +23 −17

	@@ -15,17 +15,17 @@ import (
15	)	15	)
16		16
17	var wr = io.WriteString	17	var wr = io.WriteString
18	var Templates = make(map[string]string)
19		18
20	type skunkyart struct {	19	type skunkyart struct {
21	Writer http.ResponseWriter	20	Writer http.ResponseWriter
22		21
23	Args url.Values	22	Args url.Values
24	BasePath string	23	Page int
25	Type rune	24	Type rune
26	Query, QueryRaw string	25	Atom bool
27	Page int	26
28	Atom bool	27	BasePath, Endpoint string
		28	Query, QueryRaw string
29		29
30	Templates struct {	30	Templates struct {
31	About struct {	31	About struct {
	@@ -136,7 +136,7 @@ func (s skunkyart) GRUser() {
136	case "cover_deviation":	136	case "cover_deviation":
137	group.About.BGMeta = x.ModuleData.CoverDeviation.Deviation	137	group.About.BGMeta = x.ModuleData.CoverDeviation.Deviation
138	group.About.BGMeta.Url = ConvertDeviantArtUrlToSkunkyArt(group.About.BGMeta.Url)	138	group.About.BGMeta.Url = ConvertDeviantArtUrlToSkunkyArt(group.About.BGMeta.Url)
139	group.About.BG = ParseMedia(group.About.BGMeta.Media)	139	group.About.BG = ParseMedia(group.About.BGMeta.Media, group.About.BGMeta.Title)
140	case "group_admins":	140	case "group_admins":
141	var htm strings.Builder	141	var htm strings.Builder
142	for _, z := range x.ModuleData.GroupAdmins.Results {	142	for _, z := range x.ModuleData.GroupAdmins.Results {
	@@ -171,7 +171,7 @@ func (s skunkyart) GRUser() {
171	folders.WriteString(`<a href="`)	171	folders.WriteString(`<a href="`)
172	folders.WriteString(ConvertDeviantArtUrlToSkunkyArt(x.Thumb.Url))	172	folders.WriteString(ConvertDeviantArtUrlToSkunkyArt(x.Thumb.Url))
173	folders.WriteString(`"><img loading="lazy" src="`)	173	folders.WriteString(`"><img loading="lazy" src="`)
174	folders.WriteString(ParseMedia(x.Thumb.Media))	174	folders.WriteString(ParseMedia(x.Thumb.Media, x.Thumb.Title))
175	folders.WriteString(`" title="`)	175	folders.WriteString(`" title="`)
176	folders.WriteString(x.Thumb.Title)	176	folders.WriteString(x.Thumb.Title)
177	folders.WriteString(`"></a>`)	177	folders.WriteString(`"></a>`)
	@@ -180,7 +180,7 @@ func (s skunkyart) GRUser() {
180	}	180	}
181	folders.WriteString("<br>")	181	folders.WriteString("<br>")
182		182
183	folders.WriteString(`<a href="?folder=`)	183	folders.WriteString(`<a href="group_user?folder=`)
184	folders.WriteString(strconv.Itoa(x.FolderId))	184	folders.WriteString(strconv.Itoa(x.FolderId))
185	folders.WriteString("&q=")	185	folders.WriteString("&q=")
186	folders.WriteString(s.Query)	186	folders.WriteString(s.Query)
	@@ -209,7 +209,7 @@ func (s skunkyart) GRUser() {
209	}	209	}
210		210
211	if !s.Atom {	211	if !s.Atom {
212	s.ExecuteTemplate("gruser.htm", &s)	212	s.ExecuteTemplate("gruser.htm", "html", &s)
213	}	213	}
214	}	214	}
215		215
	@@ -233,7 +233,7 @@ func (s skunkyart) Deviation(author, postname string) {
233	}	233	}
234	// время публикации	234	// время публикации
235	post.StringTime = post.Post.Deviation.PublishedTime.UTC().String()	235	post.StringTime = post.Post.Deviation.PublishedTime.UTC().String()
236	post.Post.IMG = ParseMedia(post.Post.Deviation.Media)	236	post.Post.IMG = ParseMedia(post.Post.Deviation.Media, post.Post.Deviation.Title)
237	for _, x := range post.Post.Deviation.Extended.RelatedContent {	237	for _, x := range post.Post.Deviation.Extended.RelatedContent {
238	if len(x.Deviations) != 0 {	238	if len(x.Deviations) != 0 {
239	post.Related += s.DeviationList(x.Deviations, false)	239	post.Related += s.DeviationList(x.Deviations, false)
	@@ -258,7 +258,7 @@ func (s skunkyart) Deviation(author, postname string) {
258		258
259	post.Comments = s.ParseComments(devianter.GetComments(id, post.Post.Comments.Cursor, s.Page, 1))	259	post.Comments = s.ParseComments(devianter.GetComments(id, post.Post.Comments.Cursor, s.Page, 1))
260		260
261	s.ExecuteTemplate("deviantion.htm", &s)	261	s.ExecuteTemplate("deviantion.htm", "html", &s)
262	}	262	}
263		263
264	func (s skunkyart) DD() {	264	func (s skunkyart) DD() {
	@@ -281,11 +281,16 @@ func (s skunkyart) DD() {
281	More: dd.HasMore,	281	More: dd.HasMore,
282	})	282	})
283	if !s.Atom {	283	if !s.Atom {
284	s.ExecuteTemplate("daily.htm", &s)	284	s.ExecuteTemplate("daily.htm", "html", &s)
285	}	285	}
286	}	286	}
287		287
288	func (s skunkyart) Search() {	288	func (s skunkyart) Search() {
		289	if s.Query == "" {
		290	s.ReturnHTTPError(400)
		291	return
		292	}
		293
289	var err error	294	var err error
290	ss := &s.Templates.Search	295	ss := &s.Templates.Search
291	switch s.Type {	296	switch s.Type {
	@@ -338,6 +343,7 @@ func (s skunkyart) Search() {
338	}	343	}
339	default:	344	default:
340	s.ReturnHTTPError(400)	345	s.ReturnHTTPError(400)
		346	return
341	}	347	}
342	try(err)	348	try(err)
343		349
	@@ -348,7 +354,7 @@ func (s skunkyart) Search() {
348	})	354	})
349	}	355	}
350		356
351	s.ExecuteTemplate("search.htm", &s)	357	s.ExecuteTemplate("search.htm", "html", &s)
352	}	358	}
353		359
354	func (s skunkyart) Emojitar(name string) {	360	func (s skunkyart) Emojitar(name string) {
	@@ -367,6 +373,6 @@ func (s skunkyart) Emojitar(name string) {
367	func (s skunkyart) About() {	373	func (s skunkyart) About() {
368	s.Templates.About.Nsfw = CFG.Nsfw	374	s.Templates.About.Nsfw = CFG.Nsfw
369	s.Templates.About.Proxy = CFG.Proxy	375	s.Templates.About.Proxy = CFG.Proxy
370	try(json.Unmarshal([]byte(Templates["instances.json"]), &s.Templates.About))	376	try(json.Unmarshal(instances, &s.Templates.About))
371	s.ExecuteTemplate("about.htm", &s)	377	s.ExecuteTemplate("about.htm", "html", &s)
372	}	378	}

config.example.json +1 −5

         "max-size": 1024,
         "update-interval": 5
     },
-    "dirs-to-memory": [
+    "static-path": "static",
-        "html",
-        "css",
-        "misc"
-    ],
     "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,

html/daily.htm deleted −28

	@@ -1,28 +0,0 @@
1	<!DOCTYPE html>
2	<html>
3	<head>
4	<title>SkunkyArt \| Daily Deviations</title>
5	<link rel="stylesheet" href="{{.BasePath}}stylesheet">
6	<link rel="icon" type="image/x-icon" href="{{.BasePath}}favicon.ico">
7	</head>
8	<main>
9	<header>
10	<h1><a href="{{.BasePath}}">HOME</a> \| <a href="{{.BasePath}}dd">DD</a> \| <a href="?atom=true">RSS</a></h1>
11	<form method="get" action="{{.BasePath}}search">
12	<input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
13	<select name="type">
14	<option value="all">All</option>
15	<option value="tag">Tag</option>
16	<option value="r">Groups</option>
17	</select>
18	<button type="submit">Search!</button>
19	</form>
20	</header>
21	{{if ne .Templates.DDStrips ""}}
22	<h2 id="strips"><a href="#strips">#</a> Strips</h2>
23	{{.Templates.DDStrips}}
24	{{end}}
25	<h2 id="content"><a href="#content">#</a> Content</h2>
26	{{.Templates.SomeList}}
27	</main>
28	</html>\ No newline at end of file

html/search.htm deleted −30

	@@ -1,30 +0,0 @@
1	<!DOCTYPE html>
2	<html>
3	<head>
4	<title>SkunkyArt \| Search "{{.QueryRaw}}"</title>
5	<link rel="stylesheet" href="{{.BasePath}}stylesheet">
6	<link rel="icon" type="image/x-icon" href="{{.BasePath}}favicon.ico">
7	</head>
8	<main>
9	<header>
10	<h1><a href="{{.BasePath}}">HOME</a> \| <a href="{{.BasePath}}dd">DD</a></h1>
11	<form method="get" action="search">
12	<input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
13	<select name="type">
14	<option value="all">All</option>
15	<option value="tag">Tag</option>
16	<option value="r">Groups</option>
17	</select>
18	<button type="submit">Search!</button>
19	</form>
20	</header>
21	{{if ne .Templates.Search.List ""}}
22	{{if ne .Templates.Search.Content.Total 0}}
23	<h1>Results by request '{{.QueryRaw}}': {{.Templates.Search.Content.Total}}</h1>
24	{{end}}
25	{{.Templates.Search.List}}
26	{{else}}
27	<p>No results :(</p>
28	{{end}}
29	</main>
30	</html>\ No newline at end of file

main.go +2 −1

 import (
 	"skunkyart/app"
+	"skunkyart/static"
 	"time"
 	"git.macaw.me/skunky/devianter"
 	app.ExecuteCommandLineArguments()
 	app.ExecuteConfig()
-	app.CopyTemplatesToMemory()
+	static.CopyTemplatesToMemory()
 	go func() {
 		for {

css/skunky.css → static/css/skunky.css renamed +11 −2

 header {
     display: flex;
 }
+form {
+    font-size: 0;
+    border: solid #164e3e 1px;
+    max-width: fit-content;
+}
 form input, button, select {
     background-color: #134134;
     padding: 5px;
     color: whitesmoke;
-    border: 0px;
+    border: 0;
-    border-radius: 1px;
+}
+input:focus {
+    outline: none;
 }
 /* BLOCKS */
     header form {
         font-size: 60%;
+        max-width: unset;
+        border: 0;
     }
     header, center {
         text-align: center;

html/about.htm → static/html/about.htm renamed +2 −17

	@@ -1,23 +1,8 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<html>	2	<html>
3	<head>	3	{{template "head" .}}
4	<title>SkunkyArt</title>
5	<link rel="stylesheet" href="{{.BasePath}}stylesheet">
6	<link rel="icon" type="image/x-icon" href="{{.BasePath}}favicon.ico">
7	</head>
8	<main>	4	<main>
9	<header>	5	{{template "header" .}}
10	<h1><a href="{{.BasePath}}">HOME</a> \| <a href="{{.BasePath}}dd">DD</a></h1>
11	<form method="get" action="{{.BasePath}}search">
12	<input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
13	<select name="type">
14	<option value="all">All</option>
15	<option value="tag">Tag</option>
16	<option value="r">Groups</option>
17	</select>
18	<button type="submit">Search!</button>
19	</form>
20	</header>
21	<p>	6	<p>
22	SkunkyArt is an alternative frontend for deviantart.com, written in Go.	7	SkunkyArt is an alternative frontend for deviantart.com, written in Go.
23	</p>	8	</p>

static/html/daily.htm added +13

@@ -0,0 +1,13 @@
	1	<!DOCTYPE html>
	2	<html>
	3	{{template "head" . }}
	4	<main>
	5	{{template "header" . }}
	6	{{if ne .Templates.DDStrips ""}}
	7	<h2 id="strips"><a href="#strips">#</a> Strips</h2>
	8	{{.Templates.DDStrips}}
	9	{{end}}
	10	<h2 id="content"><a href="#content">#</a> Content</h2>
	11	{{.Templates.SomeList}}
	12	</main>
	13	</html>\ No newline at end of file

html/deviantion.htm → static/html/deviantion.htm renamed +2 −18

	@@ -1,24 +1,8 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<html>	2	<html>
3	<head>	3	{{template "head" . }}
4	<title>SkunkyArt \| {{.Templates.Deviation.Post.Deviation.Author.Username}} - {{.Templates.Deviation.Post.Deviation.Title}}</title>
5	<link rel="stylesheet" href="{{.BasePath}}stylesheet">
6	<meta name="referrer" content="no-referrer" />
7	<link rel="icon" type="image/x-icon" href="{{.BasePath}}favicon.ico">
8	</head>
9	<main>	4	<main>
10	<header>	5	{{template "header" . }}
11	<h1><a href="{{.BasePath}}">HOME</a> \| <a href="{{.BasePath}}dd">DD</a></h1>
12	<form method="get" action="{{.BasePath}}search">
13	<input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
14	<select name="type">
15	<option value="all">All</option>
16	<option value="tag">Tag</option>
17	<option value="r">Groups</option>
18	</select>
19	<button type="submit">Search!</button>
20	</form>
21	</header>
22	<figure>	6	<figure>
23	<img src="{{.BasePath}}media/emojitar/{{.Templates.Deviation.Post.Deviation.Author.Username}}?type=a" width="30px">	7	<img src="{{.BasePath}}media/emojitar/{{.Templates.Deviation.Post.Deviation.Author.Username}}?type=a" width="30px">
24	<span><strong><a href="{{.BasePath}}group_user?type=about&q={{.Templates.Deviation.Post.Deviation.Author.Username}}">{{.Templates.Deviation.Post.Deviation.Author.Username}}</a></strong> — {{if (.Templates.Deviation.Post.Deviation.DD)}}	8	<span><strong><a href="{{.BasePath}}group_user?type=about&q={{.Templates.Deviation.Post.Deviation.Author.Username}}">{{.Templates.Deviation.Post.Deviation.Author.Username}}</a></strong> — {{if (.Templates.Deviation.Post.Deviation.DD)}}

html/gruser.htm → static/html/gruser.htm renamed +3 −13

 <!DOCTYPE html>
 <html>
-    <head>
+    {{template "head" . }}
-        <title>SkunkyArt |
-        {{if eq .Type 'a'}}
-        {{.Templates.GroupUser.GR.Owner.Username}}
-        {{else}}
-        gallery of {{.Templates.GroupUser.GR.Owner.Username}}
-        {{end}}
-        </title>
-        <link rel="stylesheet" href="{{.BasePath}}stylesheet">
-        <link rel="icon" type="image/x-icon" href="{{.BasePath}}favicon.ico">
-    </head>
     <main>
         <header>
             <h1><a href="{{.BasePath}}">HOME</a> | <a href="{{.BasePath}}dd">DD</a>
-            | <a href="?q={{.Templates.GroupUser.GR.Owner.Username}}&type={{if eq .Type 'a'}}gallery">Gallery{{else}}about">About{{end}}</a>
+            | <a href="group_user?q={{.Templates.GroupUser.GR.Owner.Username}}&type={{if eq .Type 'a'}}gallery">Gallery{{else}}about">About{{end}}</a>
-             | <a href="?q={{.Templates.GroupUser.GR.Owner.Username}}&type=gallery&atom=true">RSS</a></h1>
+             | <a href="group_user?q={{.Templates.GroupUser.GR.Owner.Username}}&type=gallery&atom=true">RSS</a></h1>
              <form method="get" action="{{.BasePath}}search">
                 <input type="gallery" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
                 <input type="hidden" name="usr" value="{{.Templates.GroupUser.GR.Owner.Username}}">

static/html/head.htm added +24

@@ -0,0 +1,24 @@
	1	{{define "head"}}
	2	<head>
	3	<title>SkunkyArt \|
	4	{{if eq .Endpoint "search"}}
	5	"{{.QueryRaw}}"
	6	{{else if eq .Endpoint "post"}}
	7	{{.Templates.Deviation.Post.Deviation.Author.Username}} — {{.Templates.Deviation.Post.Deviation.Title}}
	8	{{else if eq .Type 'a'}}
	9	{{if .Templates.GroupUser.GR.Owner.Username}}
	10	{{.Templates.GroupUser.GR.Owner.Username}}
	11	{{else}}
	12	gallery of {{.Templates.GroupUser.GR.Owner.Username}}
	13	{{end}}
	14	{{else}}
	15	{{.Endpoint}}
	16	{{end}}
	17	</title>
	18
	19	<base href="{{.BasePath}}">
	20	<meta name="referrer" content="no-referrer" />
	21	<link rel="stylesheet" href="{{.BasePath}}stylesheet">
	22	<link rel="icon" type="image/x-icon" href="{{.BasePath}}favicon.ico">
	23	</head>
	24	{{end}}\ No newline at end of file

static/html/header.htm added +14

@@ -0,0 +1,14 @@
	1	{{define "header"}}
	2	<header>
	3	<h1><a href="">HOME</a> \| <a href="dd">DD</a> {{if eq .Endpoint "dd"}}\| <a href="{{.Endpoint}}?atom=true">RSS</a>{{end}}</h1>
	4	<form method="get" action="search">
	5	<input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false" value="{{.QueryRaw}}">
	6	<select name="type">
	7	<option value="all">All</option>
	8	<option value="tag">Tag</option>
	9	<option value="r">Groups</option>
	10	</select>
	11	<button type="submit">Search!</button>
	12	</form>
	13	</header>
	14	{{end}}\ No newline at end of file

html/index.htm → static/html/index.htm renamed +4 −4

	@@ -2,12 +2,12 @@
2	<html>	2	<html>
3	<head>	3	<head>
4	<title>SkunkyArt</title>	4	<title>SkunkyArt</title>
5	<link rel="stylesheet" href="{{.}}stylesheet"/>	5	<link rel="stylesheet" href="stylesheet"/>
6	<link rel="icon" type="image/x-icon" href="{{.}}favicon.ico">	6	<link rel="icon" type="image/x-icon" href="favicon.ico">
7	</head>	7	</head>
8	<main>	8	<main>
9	<center>	9	<center>
10	<form method="get" action="{{.}}search">	10	<form method="get" action="search">
11	<input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">	11	<input type="text" name="q" placeholder="Search for ..." autocomplete="off" autocapitalize="none" spellcheck="false">
12	<select name="type">	12	<select name="type">
13	<option value="all">All</option>	13	<option value="all">All</option>
	@@ -16,7 +16,7 @@
16	</select>	16	</select>
17	<button type="submit">Search!</button>	17	<button type="submit">Search!</button>
18	</form>	18	</form>
19	<h1><a href="{{.}}dd">Daily Deviations</a> \| <a href="{{.}}about">About</a> \| <a href="https://git.macaw.me/skunky/SkunkyArt" target="_blank">Source Code</a></h1>	19	<h1><a href="dd">Daily Deviations</a> \| <a href="about">About</a> \| <a href="https://git.macaw.me/skunky/SkunkyArt" target="_blank">Source Code</a></h1>
20	</center>	20	</center>
21	</main>	21	</main>
22	</html>\ No newline at end of file	22	</html>\ No newline at end of file

static/html/search.htm added +16

@@ -0,0 +1,16 @@
	1	<!DOCTYPE html>
	2	<html>
	3	{{template "head" . }}
	4	<main>
	5	{{template "header" . }}
	6
	7	{{if ne .Templates.Search.List ""}}
	8	{{if ne .Templates.Search.Content.Total 0}}
	9	<h1>Results by request '{{.QueryRaw}}': {{.Templates.Search.Content.Total}}</h1>
	10	{{end}}
	11	{{.Templates.Search.List}}
	12	{{else}}
	13	<p>No results :(</p>
	14	{{end}}
	15	</main>
	16	</html>\ No newline at end of file

misc/logo.png → static/images/logo.png renamed

static/templates-noembed.go added +148

@@ -0,0 +1,148 @@
	1	//go:build !embed
	2	// +build !embed
	3
	4	package static
	5
	6	import (
	7	"bytes"
	8	"io/fs"
	9	"os"
	10	"strings"
	11	"time"
	12	)
	13
	14	var Templates FS
	15
	16	type file struct {
	17	path string
	18	name string
	19	content []byte
	20	}
	21
	22	var templateNames = []string{}
	23	var templates = make(map[string][]file)
	24	var StaticPath string
	25
	26	func CopyTemplatesToMemory() {
	27	baseDir, err := os.ReadDir(StaticPath)
	28	try(err)
	29
	30	for _, c := range baseDir {
	31	if c.IsDir() {
	32	templateNames = append(templateNames, c.Name())
	33
	34	var filePath strings.Builder
	35	filePath.WriteString(StaticPath)
	36	filePath.WriteString("/")
	37	filePath.WriteString(c.Name())
	38
	39	dir, err := os.ReadDir(filePath.String())
	40	try(err)
	41
	42	filePath.WriteString("/")
	43	for _, cd := range dir {
	44	f, err := os.ReadFile(filePath.String() + cd.Name())
	45	try(err)
	46	templates[c.Name()] = append(templates[c.Name()], file{
	47	content: f,
	48	name: cd.Name(),
	49	path: c.Name() + "/" + cd.Name(),
	50	})
	51	}
	52	}
	53	}
	54	}
	55
	56	type FS struct{}
	57
	58	func (FS) Open(name string) (fs.File, error) {
	59	for i, l := 0, len(templateNames); i < l; i++ {
	60	for _, x := range templates[templateNames[i]] {
	61	if x.content != nil && name == x.path {
	62	return &File{
	63	name: x.path,
	64	content: bytes.NewBuffer(x.content),
	65	}, nil
	66	}
	67	}
	68	}
	69	return nil, &fs.PathError{}
	70	}
	71
	72	func (FS) Glob(pattern string) ([]string, error) {
	73	trimmed := strings.Split(pattern, "/")
	74	var matches = []string{}
	75	for x, s := range templates {
	76	for i, l := 0, len(s); i < l && trimmed[0] == x; i++ {
	77	s := s[i]
	78	matches = append(matches, s.path)
	79	}
	80	}
	81	if len(matches) != 0 {
	82	return matches, nil
	83	}
	84	return nil, &fs.PathError{}
	85	}
	86
	87	func try(err error) {
	88	if err != nil {
	89	println(err.Error())
	90	os.Exit(1)
	91	}
	92	}
	93
	94	/* сделано на основе https://github.com/psanford/memfs; требуется для корректной работы templates.ParseFS */
	95	type fileInfo struct {
	96	name string
	97	}
	98
	99	func (fi fileInfo) Name() string {
	100	return fi.name
	101	}
	102
	103	func (fi fileInfo) Size() int64 {
	104	return 4096
	105	}
	106
	107	func (fileInfo) Mode() fs.FileMode {
	108	return 0
	109	}
	110
	111	func (fileInfo) ModTime() time.Time {
	112	return time.Time{}
	113	}
	114
	115	func (fileInfo) IsDir() bool {
	116	return false
	117	}
	118
	119	func (fileInfo) Sys() interface{} {
	120	return nil
	121	}
	122
	123	type File struct {
	124	name string
	125	content *bytes.Buffer
	126	closed bool
	127	}
	128
	129	func (f *File) Stat() (fs.FileInfo, error) {
	130	return fileInfo{
	131	name: f.name,
	132	}, nil
	133	}
	134
	135	func (f *File) Read(b []byte) (int, error) {
	136	if f.closed {
	137	return 0, fs.ErrClosed
	138	}
	139	return f.content.Read(b)
	140	}
	141
	142	func (f *File) Close() error {
	143	if f.closed {
	144	return fs.ErrClosed
	145	}
	146	f.closed = true
	147	return nil
	148	}

static/templates.go added +16

@@ -0,0 +1,16 @@
	1	//go:build embed
	2	// +build embed
	3
	4	package static
	5
	6	import "embed"
	7
	8	//go:embed *
	9	var Templates embed.FS
	10	var Enabled bool = true
	11
	12	var StaticPath string
	13
	14	func CopyTemplatesToMemory() {
	15	_ = StaticPath
	16	}

	@@ -1,15 +1,15 @@
1	<img src="https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/misc/logo.png" alt="SkunkyArt" title="SkunkyArt Logo" width="20%" loading="lazy"/>	1	<img src="/skunky/SkunkyArt/raw/branch/master/misc/logo.png" alt="SkunkyArt" title="SkunkyArt Logo" width="20%" loading="lazy"/>
2		2
3	[![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)	3	[![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)
4		4
5	Instances: [`INSTANCES.md`](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/INSTANCES.md)	5	Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md)
6		6
7	# EN 🇺🇸	7	# EN 🇺🇸
8	## Description	8	## Description
9	SkunkyArt 🦨 — alternative frontend for DevianArt, which works without JS.	9	SkunkyArt 🦨 — alternative frontend for DevianArt, which works without JS.
10	## Setup	10	## Setup
11	The sample config is in the `config.example.json` file. For custom config, use `--config` option.	11	The sample config is in the `config.example.json` file. For custom config, use `--config` option.
12	See the [`SETUP.md`](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/SETUP.md) file for more info about directives.	12	See the [`SETUP.md`](/skunky/SkunkyArt/src/branch/master/SETUP.md) file for more info about directives.
13	## Adding instance to the list	13	## Adding instance to the list
14	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:	14	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:
15	1. the Instance must not use Cloudflare.	15	1. the Instance must not use Cloudflare.
	@@ -23,7 +23,7 @@ To do this, you must either make a PR by adding your instance to the `instances.
23	SkunkyArt 🦨 — альтернативный фронтенд к DeviantArt, который полностью работает без JS (JavaScript).	23	SkunkyArt 🦨 — альтернативный фронтенд к DeviantArt, который полностью работает без JS (JavaScript).
24	## Настройка	24	## Настройка
25	Пример конфига находится в файле `config.example.json`. Чтобы указать свой конфиг, используйте cli-аргумент `--config`.	25	Пример конфига находится в файле `config.example.json`. Чтобы указать свой конфиг, используйте cli-аргумент `--config`.
26	См. [`SETUP-RU.md`](https://git.macaw.me/skunky/SkunkyArt/src/branch/master/SETUP-RU.md) для информации о настройки фронтенда.	26	См. [`SETUP-RU.md`](/skunky/SkunkyArt/src/branch/master/SETUP-RU.md) для информации о настройки фронтенда.
27	## Добавление инстанса в список	27	## Добавление инстанса в список
28	Чтобы это сделать, вы должны либо сделать PR, добавив в файлы `instances.json` и `INSTANCES.md` свой инстанс (можете воспользоваться cli-аргументом `--add-instance`, который автоматически это сделает), либо создать Issue, или сообщить о нём в комнате в Matrix. Учтите, что ваш инстанс должен соблюсти следущие правила:	28	Чтобы это сделать, вы должны либо сделать PR, добавив в файлы `instances.json` и `INSTANCES.md` свой инстанс (можете воспользоваться cli-аргументом `--add-instance`, который автоматически это сделает), либо создать Issue, или сообщить о нём в комнате в Matrix. Учтите, что ваш инстанс должен соблюсти следущие правила:
29	1. Инстанс не должен использовать Cloudflare итп.	29	1. Инстанс не должен использовать Cloudflare итп.

Commit 1537da9b16

Commit `1537da9b16`