diff --git a/.dockerignore b/.dockerignore deleted file mode 100755 index 6833fbe..0000000 --- a/.dockerignore +++ /dev/null @@ -1,6 +0,0 @@ -cache -compose.yaml -*.json -LICENSE -*.md -services diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 63ca398..4686488 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ **/cache -**/compose.yaml **/config.json **/skunkyart -**/skunkyart-* diff --git a/Dockerfile b/Dockerfile deleted file mode 100755 index fdc1919..0000000 --- a/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -ARG GO_VERSION=1.18 - -FROM --platform=$BUILDPLATFORM golang:${GO_VERSION} AS build -ARG TARGETOS -ARG TARGETARCH - -WORKDIR /build -COPY . . -RUN CGO_ENABLED=0 GOARCH=${TARGETARCH} GOOS=${TARGETOS} go build -ldflags "-s -w -extldflags '-static'" && \ - echo "skunkyart:x:10000:10000:SkunkyArt user:/:/sbin/nologin" > /etc/minimal-passwd && \ - echo "skunkyart:x:10000:" > /etc/minimal-group - -FROM scratch - -COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=build /build/static /static -COPY --from=build /build/skunkyart /skunkyart -COPY --from=build /etc/minimal-passwd /etc/passwd -COPY --from=build /etc/minimal-group /etc/group - -USER skunkyart - -ENTRYPOINT ["/skunkyart"] diff --git a/INSTANCES.md b/INSTANCES.md deleted file mode 100755 index 38cd5bb..0000000 --- a/INSTANCES.md +++ /dev/null @@ -1,11 +0,0 @@ -JSON variant should be used from master — https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/instances.json - -|Instance|Yggdrasil|I2P|Tor|NSFW|Proxifying|Modified Sources|Country| -|:------:|:-------:|:-:|:-:|:--:|:--------:|:--------------:|:-----:| -|[lost-skunk.cc](https://lost-skunk.cc/skunkyart)|[Yes](http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart)|No|No| No | Yes | No | Finland | -|[orehus.club](https://sa.orehus.club)|No|No|No| Yes | No | No | Germany | -|[bloat.cat](https://skunky.bloat.cat)|No|No|No| Yes | Yes | No | Germany | -|[lumaeris.com](https://skunkyart.lumaeris.com)|No|No|No| Yes | Yes | No | Germany | -|[art.bloat.cat](https://art.bloat.cat)|No|No|No| Yes | Yes | No | Germany | -|[dc09.ru](https://sa.dc09.ru)|No|No|No| No | Yes | No | Russia | -|[opnxng.com](https://da.opnxng.com)|No|No|No| Yes | Yes | No | Singapore | diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 index e5f404d..9e30da0 --- a/README.md +++ b/README.md @@ -1,51 +1,78 @@ -> [!NOTE] -> Currently, due to school, I cannot actively develop this project :( -> However, this does not mean that development has stopped. Just wait for the summer. For questions, write either to the Matrix room or to me in DM. - -SkunkyArt - -[![Matrix room](https://img.shields.io/badge/matrix-000000?style=for-the-badge&logo=Matrix&logoColor=white)](https://go.kde.org/matrix/#/#skunkyart:gnulinux.club) - -Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md) +[![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| +|:-----:|:-------:|:-:|:-:|:--:|:--------:|:-----:| +|[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 | # 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`](/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. +SkunkyArt 🦨 -- alternative frontend to DeviantArt, which will work without problems even on quite old hardware, due to the lack of JavaScript. +## 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/ +* `cache` -- caching system; default is off. +* * `path` -- the path to the cache +* * `lifetime` -- cache file lifetime; measured in Unix milliseconds. +* * `max-size` -- maximum file size in bytes. +* `dirs-to-memory` -- this setting determines which directories will be copied to RAM when SkunkyArt is started. Required +* `download-proxy` -- proxy address for downloading files. +## Examples of reverse proxies +Nginx: +```apache +server { + 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))'. + proxy_set_header Scheme $scheme; + proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_pass http://((IP)):((PORT)); + } +} +``` +## 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: +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 +* [Лис⚛](https://go.kde.org/matrix/#/@fox:matrix.org) -- helped me understand Go and gave me a lot of useful advice on this language. # 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`](/skunky/SkunkyArt/src/branch/master/SETUP-RU.md) для информации о настройки фронтенда. -## Добавление инстанса в список -Чтобы это сделать, вы должны либо сделать PR, добавив в файлы `instances.json` и `INSTANCES.md` свой инстанс (можете воспользоваться cli-аргументом `--add-instance`, который автоматически это сделает), либо создать Issue, или сообщить о нём в комнате в Matrix. Учтите, что ваш инстанс должен соблюсти следущие правила: -1. Инстанс не должен использовать Cloudflare итп. +SkunkyArt 🦨 -- альтернативный фронтенд к DeviantArt, который будет работать без проблем даже на довольно старом оборудовании, за счёт отсутствия JavaScript. +## Конфиг +Пример конфига находится в файле `config.example.json`. Чтобы указать свой путь до конфига, используйте CLI-аргумент `-c` или `--config`. +* `listen` -- адрес и порт, на котором будет слушать SkunkyArt +* `base-path` -- путь к инстансу. Пример: "base-path": "/art/" -> https://skunky.ebloid.ru/art/ +* `cache` -- система кеширования; по умолчанию - выкл. +* * `path` -- путь до кеша +* * `lifetime` -- время жизни файла в кеше; измеряется в Unix-миллисекундах +* * `max-size` -- максимальный размер файла в байтах +* `dirs-to-memory` -- данная настройка определяет какие каталоги будут скопированы в ОЗУ при запуске SkunkyArt. Обязательна +* `download-proxy` -- адрес прокси для загрузки файлов +## Примеры reverse-прокси +Nginx: +```apache +server { + listen 443 ssl; + server_name skunky.example.com; + + location ((BASE URL)) { # если у вас отдельный поддомен для фронтенда, вместо '((BASE URL))' вставляйте '/' + proxy_set_header Scheme $scheme; + proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_pass http://((IP)):((PORT)); + } +} +``` +## Как добавить свой инстанс в список? +Чтобы это сделать, вы должны либо сделать PR, добавив в файл `instances.json` свой инстанс, либо сообщить о нём в комнате в 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 +* [Лис⚛](https://go.kde.org/matrix/#/@fox:matrix.org) -- помог разобраться в Go и много чего полезного посоветовал по этому языку. \ No newline at end of file diff --git a/REDIRECTS.md b/REDIRECTS.md deleted file mode 100755 index 2469977..0000000 --- a/REDIRECTS.md +++ /dev/null @@ -1,13 +0,0 @@ -# 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 deleted file mode 100755 index 7d7d04c..0000000 --- a/SETUP-RU.md +++ /dev/null @@ -1,42 +0,0 @@ -[English version 🇬🇧](/skunky/SkunkyArt/src/branch/master/SETUP.md) - -# Единицы измерения -Размер файла в кеше измеряется в мегабайтах.
-Единицы времени: -* `i` — минуты -* `h` — часы -* `w` — недели -* `m` — месяца -* `y` — года - -# Конфигурация -* `listen` — IP и порт для слушанья; заполняется по такой форме: ip:port -* `uri` — URI инстанса. Пример: `"uri":"/art/"` -> https://skunky.ebloid.ru/art/ -* `cache` — Система кеширования; по умолчанию выключена - * `enabled` — Состояние системы кеширования; требуется булёвое значение - * `path` — Полный путь до каталога, куда будет сохраняться кеш - * `lifetime` — Время жизни файла в кеше, требует целочисленное значение, дополненное суффиксом времени (см. 'Единицы времени') - * `max-size` — Максимальный размер файла - * `update-interval` — Интервал для автоматической ротации кеша -* `static-path` — Строка, являющаяся путём до статики. SkunkyArt при запуске скопирует содержимое этого каталога в ОЗУ. Однако, если вы собрали фронтенд с тегом 'embed', то этого не произайдёт -* `download-proxy` — Адрес прокси для загрузки файлов -* `user-agent` — Строка, которая используется в качестве User-Agent'а - -# Настройка обратного прокси -Если вы собираетесь хостить инстанс в Интернете, то вам следует настроить заголовок прокси [`X-Forwarded-Proto`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto). В противном случае, все ссылки на вашем инстансе будут вида "http". Ниже есть информация о том, как настроить обратное проксирование: - -Nginx: -```apache -server { - listen 443 ssl; - server_name skunky.example.com; - - # Если используется поддомен, то вместо ((BASE_URL)), укажите '/'. - location ((BASE_URL)) { - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_http_version 1.1; - proxy_pass http://((IP)):((PORT)); - } -} -``` \ No newline at end of file diff --git a/SETUP.md b/SETUP.md deleted file mode 100755 index cc89118..0000000 --- a/SETUP.md +++ /dev/null @@ -1,42 +0,0 @@ -[Версия на русском языке 🇷🇺](/skunky/SkunkyArt/src/branch/master/SETUP-RU.md) - -# Units -Maximum file size in megabytes, requires numeric value.
-Time units: -* `i` — minutes -* `h` — hours -* `w` — weeks -* `m` — months -* `y` — years - -# Config -* `listen` — IP and port to listen on in the following form: ip:port -* `uri` — Instance URI. Example: `"uri":"/art/"` -> https://skunky.ebloid.ru/art/ -* `cache` — Caching system; default is off. - * `enabled` — Caching system state, requires boolean value - * `path` — Path to cache directory, requires absolute filesystem path - * `lifetime` — Cached file life time, requires numeric value, followed by multiplicative suffix (see Time Units for details) - * `max-size` — Maximum file size in megabytes - * `update-interval` — Automatic rotation interval -* `static-path` — This setting determines path to static, which will be copied to RAM when SkunkyArt is started. Useless if you're use binary compiled with 'embed' tag. -* `download-proxy` — Proxy address for downloading files. -* `user-agent` — String, which SkunkyArt uses as UA - -# Setting up reverse proxy -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. - -Nginx example configuration: -```apache -server { - listen 443 ssl; - server_name skunky.example.com; - - # In case of subdomain, use / instend of ((BASE_URL)) - location ((BASE_URL)) { - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_http_version 1.1; - proxy_pass http://((IP)):((PORT)); - } -} -``` \ No newline at end of file diff --git a/TODO.md b/TODO.md old mode 100755 new mode 100644 index 01bc524..2334695 --- a/TODO.md +++ b/TODO.md @@ -1,23 +1,7 @@ # v1.3.x -* Почистить говнокод -* Добавить фильтры поиска -* ~~Сделать порт под FreeBSD~~ ✔️ -* **Доделать парсинг описания** -* ~~Реализовать стрипы в ежедневных артах~~ ✔️ -* ~~Исправить баг с навигацией по страницам~~ ✔️ -* ~~Сделать нормальное отображение ошибок~~ ✔️ -* ~~Сделать единицы в конфиге более понятными~~ ✔️ -* Добавить чекер инстанса на работоспособность -* ~~Добавить просмотр понравившихся артов пользователю~~ ✔️ -* Добавить возможность включить темплейты в бинарник [P] -* ~~Реализовать миниатюры и оптимизировать CSS под маленькие экраны~~ ✔️ -* Написать Makefile и скрипт для автоматического развёртывания инстанса -* Исправить баг с эмоджи, когда некоторые кастомные эмоции могут не отображаться -* ~~Добавить аргумент &filename, который будет выдавать файл с нормально выглядещем именем~~ ✔️ -* ~~Улучшить систему кеширования: добавить рейтинг для удаления и копирование изображений в ОЗУ~~ ✔️ +* Доделать парсинг описания +* Реализовать миниатюры и оптимизировать CSS под маленькие экраны # v1.4 -* Реализовать API * Реализовать темы -* Перейти на арены в кеше * Реализовать многоязычный интерфейс - +* Реализовать API \ No newline at end of file diff --git a/app/api.go b/app/api.go deleted file mode 100755 index d2a5655..0000000 --- a/app/api.go +++ /dev/null @@ -1,82 +0,0 @@ -package app - -import ( - "encoding/json" - "math/rand" - "strings" - - "git.macaw.me/skunky/devianter" -) - -type API struct { - main *skunkyart -} - -type info struct { - Version string `json:"version"` - Settings settingsParams `json:"settings"` -} - -func (a API) Info() { - json, err := json.Marshal(info{ - Version: a.main.Version, - Settings: settingsParams{ - Nsfw: CFG.Nsfw, - Proxy: CFG.Proxy, - }, - }) - try(err) - a.main.Writer.Write(json) -} - -func (a API) Error(description string, status int) { - a.main.Writer.WriteHeader(status) - var response strings.Builder - response.WriteString(`{"error":"`) - response.WriteString(description) - response.WriteString(`"}`) - wr(a.main.Writer, response.String()) -} - -func (a API) sendMedia(d *devianter.Deviation) { - mediaUrl, name := devianter.UrlFromMedia(d.Media) - a.main.SetFilename(name) - if len(mediaUrl) != 0 { - return - } - - if CFG.Proxy { - mediaUrl = mediaUrl[21:] - dot := strings.Index(mediaUrl, ".") - a.main.Writer.Header().Del("Content-Type") - a.main.DownloadAndSendMedia(mediaUrl[:dot], mediaUrl[dot+11:]) - } else { - a.main.Writer.Header().Add("Location", mediaUrl) - a.main.Writer.WriteHeader(302) - } -} - -// TODO: сделать фильтры -func (a API) Random() { - for attempt := 1; ; { - if attempt > 3 { - a.Error("Sorry, butt NSFW on this are disabled, and the instance failed to find a random art without NSFW", 500) - } - - s, err, daErr := devianter.PerformSearch(string(rand.Intn(999)), rand.Intn(30), 'a') - try(err) - if daErr.RAW != nil { - continue - } - - deviation := &s.Results[rand.Intn(len(s.Results))] - - if deviation.NSFW && !CFG.Nsfw { - attempt++ - continue - } - - a.sendMedia(deviation) - return - } -} diff --git a/app/cache.go b/app/cache.go deleted file mode 100755 index e03db67..0000000 --- a/app/cache.go +++ /dev/null @@ -1,152 +0,0 @@ -// TODO: реализовать кеширование JSON и почистить код -package app - -import ( - "crypto/sha1" - "encoding/hex" - "io" - "os" - "strings" - "sync" - "syscall" - "time" -) - -type file struct { - Score int - Content []byte -} - -var tempFS = make(map[[20]byte]*file) -var mx = &sync.RWMutex{} - -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) - if t := s.Args.Get("token"); t != "" { - url.WriteString("?token=") - url.WriteString(t) - } - - var response []byte - - switch { - case CFG.Cache.Enabled: - fileName := sha1.Sum([]byte(subdomain + path)) - filePath := CFG.Cache.Path + "/" + hex.EncodeToString(fileName[:]) - - c := func() { - file, err := os.Open(filePath) - if err != nil { - if dwnld := Download(url.String()); dwnld.Status == 200 && dwnld.Headers["Content-Type"][0][:5] == "image" { - response = dwnld.Body - try(os.WriteFile(filePath, response, 0700)) - } else { - s.ReturnHTTPError(dwnld.Status) - return - } - } else { - file, e := io.ReadAll(file) - try(e) - response = file - } - } - - if CFG.Cache.MemCache { - mx.Lock() - if tempFS[fileName] == nil { - tempFS[fileName] = &file{} - } - mx.Unlock() - - if tempFS[fileName].Content != nil { - response = tempFS[fileName].Content - tempFS[fileName].Score += 2 - break - } else { - c() - go func() { - defer restore() - - mx.RLock() - tempFS[fileName].Content = response - mx.RUnlock() - - for { - time.Sleep(1 * time.Minute) - - mx.Lock() - if tempFS[fileName].Score <= 0 { - delete(tempFS, fileName) - mx.Unlock() - return - } - tempFS[fileName].Score-- - mx.Unlock() - } - }() - } - } else { - c() - } - case CFG.Proxy: - dwnld := Download(url.String()) - if dwnld.Status != 200 { - s.ReturnHTTPError(dwnld.Status) - return - } - response = dwnld.Body - default: - s.Writer.WriteHeader(403) - response = []byte("Sorry, butt proxy on this instance are disabled.") - } - - s.Writer.Write(response) -} - -func InitCacheSystem() { - c := &CFG.Cache - for { - dir, err := os.ReadDir(c.Path) - if err != nil { - if os.IsNotExist(err) { - os.Mkdir(c.Path, 0700) - continue - } - println(err.Error()) - } - - var total int64 - for _, file := range dir { - fileName := c.Path + "/" + file.Name() - fileInfo, err := file.Info() - try(err) - - if c.Lifetime != "" { - now := time.Now().UnixMilli() - - stat := fileInfo.Sys().(*syscall.Stat_t) - time := statTime(stat) - - if time+lifetimeParsed <= now { - try(os.RemoveAll(fileName)) - } - } - - total += fileInfo.Size() - // if c.MaxSize != 0 && fileInfo.Size() > c.MaxSize { - // try(os.RemoveAll(fileName)) - // } - } - - if c.MaxSize != 0 && total > c.MaxSize { - try(os.RemoveAll(c.Path)) - os.Mkdir(c.Path, 0700) - } - - time.Sleep(time.Second * time.Duration(c.UpdateInterval)) - } -} diff --git a/app/cli.go b/app/cli.go deleted file mode 100755 index 0480bdb..0000000 --- a/app/cli.go +++ /dev/null @@ -1,166 +0,0 @@ -package app - -import ( - "bufio" - "bytes" - "encoding/json" - "html/template" - "os" - "time" -) - -func ExecuteCommandLineArguments() { - var helpmsg = `SkunkyArt v{{.Version}} [{{.Description}}] -Usage: - - [-c|--config] | path to config - - [-a|--add-instance] | generates 'instances.json' and 'INSTANCES.md' files with ur instance - - [-h|--help] | returns this message -Example: - ./skunkyart -c config.json -Copyright lost+skunk, X11. https://git.macaw.me/skunky/skunkyart/src/tag/v{{.Version}}` - - a := os.Args[1:] - for n, x := range a { - switch x { - case "-c", "--config": - if len(a) >= 2 { - CFG.cfg = a[n+1] - } else { - exit("Not enought arguments", 1) - } - case "-h", "--help": - var buf bytes.Buffer - t := template.New("help") - t.Parse(helpmsg) - t.Execute(&buf, &Release) - exit(buf.String(), 0) - case "-a", "--add-instance": - addInstance() - } - } -} - -type settingsUrls struct { - I2P string `json:"i2p,omitempty"` - Ygg string `json:"ygg,omitempty"` - Tor string `json:"tor,omitempty"` - Clearnet string `json:"clearnet,omitempty"` -} - -type settingsParams struct { - Nsfw bool `json:"nsfw"` - Proxy bool `json:"proxy"` -} - -type settings struct { - Title string `json:"title"` - Country string `json:"country"` - ModifiedSrc string `json:"modified-src,omitempty"` - Urls settingsUrls `json:"urls"` - Settings settingsParams `json:"settings"` -} - -func addInstance() { - prompt := func(txt string, necessary bool) string { - input := bufio.NewScanner(os.Stdin) - for { - print(txt) - print(": ") - input.Scan() - - if i := input.Text(); necessary && i == "" { - println("Please specify the", txt) - } else { - return i - } - } - } - - var settingsVar struct { - Instances []settings `json:"instances"` - } - instancesJson, err := os.OpenFile("instances.json", os.O_CREATE|os.O_WRONLY, 0644) - try(err) - defer instancesJson.Close() - - instancesFile, err := os.OpenFile("INSTANCES.md", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) - try(err) - defer instancesFile.Close() - - for { - if string(instances) == "" { - print("\rDownloading instance list...") - } else { - println("\r\033[2KDownloaded!") - try(json.Unmarshal(instances, &settingsVar)) - - settingsVar.Instances = append(settingsVar.Instances, settings{ - Title: prompt("Title", true), - Country: prompt("Country", true), - ModifiedSrc: prompt("Link to modified sources", false), - Settings: settingsParams{ - Nsfw: CFG.Nsfw, - Proxy: CFG.Proxy, - }, - Urls: settingsUrls{ - Clearnet: prompt("Clearnet link", false), - Ygg: prompt("Yggdrasil link", false), - Tor: prompt("Onion link", false), - I2P: prompt("I2P link", false), - }, - }) - - j, err := json.MarshalIndent(&settingsVar, "", " ") - try(err) - - instancesJson.Write(j) - - settingsVar := &settingsVar.Instances[len(settingsVar.Instances)-1] - var mdstr bytes.Buffer - - mdbuilder := func(yes bool, link string, title string) { - switch { - case yes && (title != "" && link != ""): - mdstr.WriteString("[") - mdstr.WriteString(title) - mdstr.WriteString("](") - mdstr.WriteString(link) - mdstr.WriteString(")") - case yes && link != "": - mdstr.WriteString("[Yes](") - mdstr.WriteString(link) - mdstr.WriteString(")") - case yes: - mdstr.WriteString("Yes") - default: - mdstr.WriteString("No") - } - mdstr.WriteString("|") - } - - mdstr.WriteString("\n|") - mdbuilder(settingsVar.Urls.Clearnet != "", settingsVar.Urls.Clearnet, settingsVar.Title) - - urls := []string{settingsVar.Urls.Ygg, settingsVar.Urls.I2P, settingsVar.Urls.Tor} - for i, l := 0, len(urls); i < l; i++ { - url := urls[i] - mdbuilder(url != "", url, "") - } - - settings := []bool{settingsVar.Settings.Nsfw, settingsVar.Settings.Proxy} - for i, l := 0, len(settings); i < l; i++ { - mdbuilder(settings[i], "", "") - } - - mdbuilder(settingsVar.ModifiedSrc != "", settingsVar.ModifiedSrc, "") - - mdstr.WriteString(settingsVar.Country) - mdstr.WriteString("|") - - instancesFile.Write(mdstr.Bytes()) - break - } - time.Sleep(500 * time.Millisecond) - } - exit("Done! Now add the files 'instances.json' and 'INSTANCES.md' to the 'master' branch in the repository https://git.macaw.me/skunky/SkunkyArt", 0) -} diff --git a/app/config.go b/app/config.go old mode 100755 new mode 100644 index 813453c..c848b9c --- a/app/config.go +++ b/app/config.go @@ -3,101 +3,87 @@ package app import ( "encoding/json" "os" - "regexp" - "skunkyart/static" - "strconv" "time" - - "git.macaw.me/skunky/devianter" ) -var Release struct { - Version string - Description string -} - type cache_config struct { Enabled bool - MemCache bool `json:"memcache"` Path string MaxSize int64 `json:"max-size"` - Lifetime string + Lifetime int64 UpdateInterval int64 `json:"update-interval"` } type config struct { cfg string Listen string - URI string `json:"uri"` + BasePath string `json:"base-path"` Cache cache_config Proxy, Nsfw bool - UserAgent string `json:"user-agent"` - DownloadProxy string `json:"download-proxy"` - StaticPath string `json:"static-path"` + DownloadProxy string `json:"download-proxy"` + Dirs []string `json:"dirs-to-memory"` } var CFG = config{ - cfg: "config.json", - Listen: "127.0.0.1:3003", - URI: "/", + cfg: "config.json", + Listen: "127.0.0.1:3003", + BasePath: "/", Cache: cache_config{ - Enabled: false, + Enabled: true, Path: "cache", UpdateInterval: 1, }, - 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", - Proxy: true, - Nsfw: true, + Dirs: []string{"html", "css"}, + 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) + time.Sleep(1 * time.Second) + } + }() + + const helpmsg = `SkunkyArt v1.3 [refactoring] +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` + + a := os.Args + for n, x := range a { + switch x { + case "-c", "--config": + if len(a) >= 3 { + CFG.cfg = a[n+1] + } else { + exit("Not enought arguments", 1) + } + case "-h", "--help": + exit(helpmsg, 0) + } + } + if CFG.cfg != "" { f, err := os.ReadFile(CFG.cfg) - tryWithExitStatus(err, 1) - tryWithExitStatus(json.Unmarshal(f, &CFG), 1) + try_with_exitstatus(err, 1) + + try_with_exitstatus(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.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 + if CFG.Cache.MaxSize != 0 || CFG.Cache.Lifetime != 0 { go InitCacheSystem() } - - About = instanceAbout{ - Proxy: CFG.Proxy, - Nsfw: CFG.Nsfw, - } - - static.StaticPath = CFG.StaticPath - devianter.UserAgent = CFG.UserAgent } } diff --git a/app/parsers.go b/app/parsers.go old mode 100755 new mode 100644 index 192a88d..0665476 --- a/app/parsers.go +++ b/app/parsers.go @@ -9,11 +9,7 @@ import ( "golang.org/x/net/html" ) -func (s skunkyart) ParseComments(c devianter.Comments, daError devianter.Error) string { - if daError.RAW != nil { - return "Failed to fetch comments :(" - } - +func (s skunkyart) ParseComments(c devianter.Comments) string { var cmmts strings.Builder replied := make(map[int]string) @@ -45,9 +41,7 @@ func (s skunkyart) ParseComments(c devianter.Comments, daError devianter.Error) cmmts.WriteString(" ") if x.Parent > 0 { - cmmts.WriteString(` In reply to `) if replied[x.Parent] == "" { @@ -76,82 +70,17 @@ func (s skunkyart) ParseComments(c devianter.Comments, daError devianter.Error) return cmmts.String() } -func (s skunkyart) DeviationList(devs []devianter.Deviation, allowAtom bool, content ...DeviationList) string { +func (s skunkyart) DeviationList(devs []devianter.Deviation, content ...DeviationList) string { + var list strings.Builder if s.Atom && s.Page > 1 { s.ReturnHTTPError(400) return "" - } - - var list, listContent strings.Builder - - 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 allowAtom && s.Atom { - s.Writer.Header().Add("Content-type", "application/atom+xml") - id := strconv.Itoa(data.ID) - listContent.WriteString(``) - listContent.WriteString(data.Author.Username) - listContent.WriteString(``) - listContent.WriteString(data.Title) - listContent.WriteString(``) - listContent.WriteString(id) - listContent.WriteString(``) - listContent.WriteString(data.PublishedTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 -0700")) - listContent.WriteString(``) - listContent.WriteString(``) - listContent.WriteString(data.Title) - listContent.WriteString(`

`) - listContent.WriteString(ParseDescription(data.TextContent)) - listContent.WriteString(`

`) - } else { - listContent.WriteString(`
`) - if fullview != "" && preview != "" { - listContent.WriteString(``) - } else { - listContent.WriteString(`

[ TEXT ]

`) - } - listContent.WriteString(`
`) - listContent.WriteString(data.Author.Username) - listContent.WriteString(" - ") - listContent.WriteString(data.Title) - - if data.NSFW { - listContent.WriteString(` [NSFW]`) - } - if data.AI { - listContent.WriteString(" [🤖]") - } - if data.DD { - listContent.WriteString(` [DD]`) - } - - listContent.WriteString("
") - } - } - } - - if allowAtom && s.Atom { + } else if s.Atom { list.WriteString(``) - list.WriteString(``) if s.Type == 0 { list.WriteString("Daily Deviations") - } else if s.Type == 'g' && len(devs) != 0 { + } else if len(devs) != 0 { list.WriteString(devs[0].Author.Username) } else { list.WriteString("SkunkyArt") @@ -161,16 +90,75 @@ func (s skunkyart) DeviationList(devs []devianter.Deviation, allowAtom bool, con list.WriteString(`<link rel="alternate" href="`) list.WriteString(Host) list.WriteString(`"/>`) - - list.WriteString(listContent.String()) - - list.WriteString("</feed>") - wr(s.Writer, list.String()) } else { list.WriteString(`<div class="content">`) + } + for _, data := range devs { + if !(data.NSFW && !CFG.Nsfw) { + url := ParseMedia(data.Media) + if s.Atom { + id := strconv.Itoa(data.ID) + list.WriteString(`<entry><author><name>`) + list.WriteString(data.Author.Username) + list.WriteString(`</name></author><title>`) + list.WriteString(data.Title) + list.WriteString(``) + list.WriteString(id) + list.WriteString(``) + list.WriteString(data.PublishedTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 -0700")) + list.WriteString(``) + list.WriteString(``) + list.WriteString(data.Title) + list.WriteString(`

`) + list.WriteString(ParseDescription(data.TextContent)) + list.WriteString(`

`) + } else { + list.WriteString(`
`) + if url != "" { + list.WriteString(``) + } else { + list.WriteString(`

[ TEXT ]

`) + } + list.WriteString(`
`) + list.WriteString(data.Author.Username) + list.WriteString(" - ") + list.WriteString(data.Title) - list.WriteString(listContent.String()) + // шильдики нсфв, аи и ежедневного поста + if data.NSFW { + list.WriteString(` [NSFW]`) + } + if data.AI { + list.WriteString(" [🤖]") + } + if data.DD { + list.WriteString(` [DD]`) + } + list.WriteString("
") + } + } + } + + if s.Atom { + list.WriteString("") + s.Writer.Write([]byte(list.String())) + return "" + } else { list.WriteString("") if content != nil { list.WriteString(s.NavBase(content[0])) @@ -188,9 +176,8 @@ type text struct { To int } -// переписать весь этот пиздец нахуй func ParseDescription(dscr devianter.Text) string { - var parsedDescription strings.Builder + var parseddescription strings.Builder TagBuilder := func(content string, tags ...string) string { l := len(tags) for x := 0; x < l; x++ { @@ -287,18 +274,16 @@ func ParseDescription(dscr devianter.Text) string { switch x.Type { case "atomic": - if len(x.EntityRanges) != 0 { - d := entities[x.EntityRanges[0].Key] - parsedDescription.WriteString(``) - } + d := entities[x.EntityRanges[0].Key] + parseddescription.WriteString(``) case "unstyled": if l := len(Styles); l != 0 { for n, r := range Styles { @@ -307,31 +292,31 @@ func ParseDescription(dscr devianter.Text) string { tag = "h2" } - parsedDescription.WriteString(x.Text[:r.From]) + parseddescription.WriteString(x.Text[:r.From]) if len(urls) != 0 && len(x.EntityRanges) != 0 { ra := &x.EntityRanges[0] - parsedDescription.WriteString(``) - parsedDescription.WriteString(r.TXT) - parsedDescription.WriteString(``) + parseddescription.WriteString(``) + parseddescription.WriteString(r.TXT) + parseddescription.WriteString(``) } else if l > n+1 { - parsedDescription.WriteString(r.TXT) + parseddescription.WriteString(r.TXT) } - parsedDescription.WriteString(TagBuilder(tag, x.Text[r.To:])) + parseddescription.WriteString(TagBuilder(tag, x.Text[r.To:])) } } else { - parsedDescription.WriteString(x.Text) + parseddescription.WriteString(x.Text) } } - parsedDescription.WriteString("
") + parseddescription.WriteString("
") } } else if dl != 0 { for tt := html.NewTokenizer(strings.NewReader(dscr.Html.Markup)); ; { switch tt.Next() { case html.ErrorToken: - return parsedDescription.String() + return parseddescription.String() case html.StartTagToken, html.EndTagToken, html.SelfClosingTagToken: token := tt.Token() switch token.Data { @@ -339,11 +324,11 @@ func ParseDescription(dscr devianter.Text) string { for _, a := range token.Attr { if a.Key == "href" { url := DeleteTrackingFromUrl(a.Val) - parsedDescription.WriteString(``) - parsedDescription.WriteString(GetValueOfTag(tt)) - parsedDescription.WriteString(" ") + parseddescription.WriteString(``) + parseddescription.WriteString(GetValueOfTag(tt)) + parseddescription.WriteString(" ") } } case "img": @@ -359,24 +344,24 @@ func ParseDescription(dscr devianter.Text) string { } if title != "" { for x := -1; x < b; x++ { - parsedDescription.WriteString(``) + parseddescription.WriteString(``) } } } case "br", "li", "ul", "p", "b": - parsedDescription.WriteString(token.String()) + parseddescription.WriteString(token.String()) case "div": - parsedDescription.WriteString("

") + parseddescription.WriteString("

") } case html.TextToken: - parsedDescription.Write(tt.Text()) + parseddescription.Write(tt.Text()) } } } - return parsedDescription.String() + return parseddescription.String() } diff --git a/app/router.go b/app/router.go old mode 100755 new mode 100644 index ac65c3d..0dd2f79 --- a/app/router.go +++ b/app/router.go @@ -3,8 +3,7 @@ package app import ( "io" "net/http" - url "net/url" - "skunkyart/static" + u "net/url" "strconv" "strings" ) @@ -13,7 +12,7 @@ var Host string func Router() { parsepath := func(path string) map[int]string { - if l := len(CFG.URI); len(path) > l { + if l := len(CFG.BasePath); len(path) > l { path = path[l-1:] } else { path = "/" @@ -43,61 +42,41 @@ func Router() { 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) { - path := parsepath(r.URL.Path) - Host = "http://" + r.Host - if h := r.Header["X-Forwarded-Proto"]; len(h) != 0 && h[0] == "https" { - Host = "https://" + r.Host + if h := r.Header["Scheme"]; len(h) != 0 && h[0] == "https" { + Host = h[0] + "://" + r.Host + } else { + Host = "http://" + r.Host } - var skunky = skunkyart{Version: Release.Version} - skunky._pth = r.URL.Path - - skunky.Args = r.URL.Query() - arg := skunky.Args.Get - p, _ := strconv.Atoi(arg("p")) - - skunky.Endpoint = path[1] - skunky.API.main = &skunky + path := parsepath(r.URL.Path) + // структура с функциями + var skunky skunkyart skunky.Writer = w - skunky.BasePath = CFG.URI + skunky.Args = r.URL.Query() + skunky.BasePath = CFG.BasePath + + arg := skunky.Args.Get skunky.QueryRaw = arg("q") - skunky.Query = url.QueryEscape(skunky.QueryRaw) - skunky.Page = p + skunky.Query = u.QueryEscape(skunky.QueryRaw) if t := arg("type"); len(t) > 0 { skunky.Type = rune(t[0]) } + p, _ := strconv.Atoi(arg("p")) + skunky.Page = p if arg("atom") == "true" { skunky.Atom = true } - if CFG.Proxy { - w.Header().Add("Content-Security-Policy", "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'") - } else { - w.Header().Add("Content-Security-Policy", "default-src 'self'; img-src 'self' *.wixmp.com; script-src 'none'; style-src 'self' 'unsafe-inline'") - } - - w.Header().Add("X-Frame-Options", "DENY") - - switch skunky.Endpoint { - // main + // пути + switch path[1] { + default: + skunky.ReturnHTTPError(404) case "": - skunky.ExecuteTemplate("index.htm", "html", &CFG.URI) - case "about": - skunky.Templates.About = About - skunky.ExecuteTemplate("about.htm", "html", &skunky) + skunky.ExecuteTemplate("index.htm", &CFG.BasePath) case "post": skunky.Deviation(path[2], path[3]) case "search": @@ -107,43 +86,21 @@ func Router() { case "group_user": skunky.GRUser() - // media case "media": switch path[2] { case "file": - if a := arg("filename"); a != "" { - skunky.SetFilename(a) - } skunky.DownloadAndSendMedia(path[3], next(path, 4)) case "emojitar": skunky.Emojitar(path[3]) } + case "about": + skunky.About() case "stylesheet": w.Header().Add("content-type", "text/css") - w.Write(open("css/skunky.css")) - case "favicon.ico": - w.Write(open("images/logo.png")) - - // API - case "api": - w.Header().Add("Content-Type", "application/json") - switch path[2] { - case "instance": - skunky.API.Info() - case "random": - skunky.API.Random() - default: - skunky.API.Error("Not Found", 404) - } - - // 404 - default: - skunky.ReturnHTTPError(404) + io.WriteString(w, Templates["skunky.css"]) } } http.HandleFunc("/", handle) - println("SkunkyArt is listening on", CFG.Listen) - - tryWithExitStatus(http.ListenAndServe(CFG.Listen, nil), 1) + try_with_exitstatus(http.ListenAndServe(CFG.Listen, nil), 1) } diff --git a/app/stat-freebsd.go b/app/stat-freebsd.go deleted file mode 100755 index 445eeae..0000000 --- a/app/stat-freebsd.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build freebsd -// +build freebsd - -package app - -import ( - "syscall" - "time" -) - -func statTime(stat *syscall.Stat_t) int64 { - return time.Unix(stat.Ctimespec.Unix()).UnixMilli() -} diff --git a/app/stat.go b/app/stat.go deleted file mode 100755 index a5bebcc..0000000 --- a/app/stat.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build !freebsd -// +build !freebsd - -package app - -import ( - "syscall" - "time" -) - -func statTime(stat *syscall.Stat_t) int64 { - return time.Unix(stat.Ctim.Unix()).UnixMilli() -} diff --git a/app/util.go b/app/util.go old mode 100755 new mode 100644 index 6ece2e8..3f69e47 --- a/app/util.go +++ b/app/util.go @@ -1,14 +1,14 @@ package app import ( - "encoding/json" + "encoding/base64" "io" "net/http" - "net/url" + u "net/url" "os" - "skunkyart/static" "strconv" "strings" + "syscall" "text/template" "time" @@ -17,8 +17,6 @@ import ( ) /* INTERNAL */ -var wr = io.WriteString - func exit(msg string, code int) { println(msg) os.Exit(code) @@ -28,105 +26,18 @@ func try(e error) { println(e.Error()) } } -func tryWithExitStatus(err error, code int) { +func try_with_exitstatus(err error, code int) { if err != nil { exit(err.Error(), code) } } -func restore() { - if r := recover(); r != nil { - recover() - } -} - -var instances []byte -var About instanceAbout - -func RefreshInstances() { - for { - func() { - defer restore() - instances = Download("https://git.macaw.me/skunky/SkunkyArt/raw/branch/master/instances.json").Body - try(json.Unmarshal(instances, &About)) - }() - time.Sleep(1 * time.Hour) - } -} - // some crap for frontend -type instanceAbout struct { - Proxy bool - Nsfw bool - Instances []settings -} - -type skunkyart struct { - Writer http.ResponseWriter - _pth string - - Args url.Values - Page int - Type rune - Atom bool - - BasePath, Endpoint string - Query, QueryRaw string - - API API - Version string - - Templates struct { - About instanceAbout - - SomeList string - DDStrips string - Deviation struct { - Post devianter.Post - Related string - StringTime string - Tags string - Comments string - } - - GroupUser struct { - GR devianter.GRuser - Admins string - Group bool - CreationDate string - - About struct { - A devianter.About - - DescriptionFormatted string - Interests, Social string - Comments string - BG string - BGMeta devianter.Deviation - } - - Gallery struct { - Folders string - Pages int - List string - } - } - Search struct { - Content devianter.Search - List string - } - } -} - -func (s skunkyart) ExecuteTemplate(file, dir string, data any) { +func (s skunkyart) ExecuteTemplate(file string, data any) { var buf strings.Builder tmp := template.New(file) - tmp, err := tmp.ParseFS(static.Templates, dir+"/*") - if err != nil { - s.Writer.WriteHeader(500) - wr(s.Writer, err.Error()) - return - } + tmp, e := tmp.Parse(Templates[file]) + try(e) try(tmp.Execute(&buf, &data)) wr(s.Writer, buf.String()) } @@ -135,29 +46,16 @@ func UrlBuilder(strs ...string) string { var str strings.Builder l := len(strs) str.WriteString(Host) - str.WriteString(CFG.URI) + str.WriteString(CFG.BasePath) for n, x := range strs { str.WriteString(x) - if n := n + 1; n < l && len(strs[n]) != 0 && !(strs[n][0] == '?' || strs[n][0] == '&') && !(x[0] == '?' || x[0] == '&') { + if n+1 < l && !(strs[n+1][0] == '?' || strs[n+1][0] == '&') && !(x[0] == '?' || x[0] == '&') { str.WriteString("/") } } return str.String() } -func (s skunkyart) Error(dAerr devianter.Error) { - s.Writer.WriteHeader(502) - - var msg strings.Builder - msg.WriteString(`

DeviantArt error — '`) - msg.WriteString(dAerr.Error) - msg.WriteString("'

") - - wr(s.Writer, msg.String()) -} - func (s skunkyart) ReturnHTTPError(status int) { s.Writer.WriteHeader(status) @@ -173,31 +71,23 @@ 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(urlString string) (d Downloaded) { +func Download(url string) (d Downloaded) { cli := &http.Client{} if CFG.DownloadProxy != "" { - u, e := url.Parse(CFG.DownloadProxy) + u, e := u.Parse(CFG.DownloadProxy) try(e) cli.Transport = &http.Transport{Proxy: http.ProxyURL(u)} } - req, e := http.NewRequest("GET", urlString, nil) + req, e := http.NewRequest("GET", url, nil) try(e) - req.Header.Set("User-Agent", CFG.UserAgent) + req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0.0") resp, e := cli.Do(req) try(e) @@ -211,29 +101,105 @@ func Download(urlString string) (d Downloaded) { return } -/* PARSING HELPERS */ -func ParseMedia(media devianter.Media, thumb ...int) string { - mediaUrl, filename := devianter.UrlFromMedia(media, thumb...) - if len(mediaUrl) != 0 && CFG.Proxy { - mediaUrl = mediaUrl[21:] - dot := strings.Index(mediaUrl, ".") - if filename == "" { - filename = "image.gif" +// 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) } - return UrlBuilder("media", "file", mediaUrl[:dot], mediaUrl[dot+11:], "&filename=", filename) - } else if !CFG.Proxy { - return mediaUrl + } 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.")) } - return "" +} + +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 != 0 { + 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 { + 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) + try_with_exitstatus(e, 1) + + for _, x := range dir { + file, e := os.ReadFile(dirname + "/" + x.Name()) + try_with_exitstatus(e, 1) + Templates[x.Name()] = string(file) + } + } +} + +/* PARSING HELPERS */ +func ParseMedia(media devianter.Media) string { + url := devianter.UrlFromMedia(media) + if len(url) != 0 && CFG.Proxy { + url = url[21:] + dot := strings.Index(url, ".") + + return UrlBuilder("media", "file", url[:dot], url[dot+11:]) + } + return url } func ConvertDeviantArtUrlToSkunkyArt(url string) (output string) { if len(url) > 32 && url[27:32] != "stash" { url = url[27:] - firstshash := strings.Index(url, "/") - lastshash := firstshash + strings.Index(url[firstshash+1:], "/") - if lastshash != -1 { - output = UrlBuilder("post", url[:firstshash], url[lastshash+2:]) + toart := strings.Index(url, "/art/") + if toart != -1 { + output = UrlBuilder("post", url[:toart], url[toart+5:]) } } return @@ -253,10 +219,11 @@ func BuildUserPlate(name string) string { func GetValueOfTag(t *html.Tokenizer) string { for tt := t.Next(); ; { - if tt == html.TextToken { - return string(t.Text()) - } else { + switch tt { + default: return "" + case html.TextToken: + return string(t.Text()) } } } @@ -269,14 +236,16 @@ type DeviationList struct { // FIXME: на некоротрых артах первая страница может вызывать полное отсутствие панели навигации. func (s skunkyart) NavBase(c DeviationList) string { + // TODO: сделать понятнее + // навигация по страницам var list strings.Builder - list.WriteString("
") + p := s.Page + + // функция для генерации ссылок prevrev := func(msg string, page int, onpage bool) { if !onpage { - list.WriteString(` 0 { - var onPage bool - if i == p { - onPage = true + if c.Pages > 0 { + // назад + for x := p - 6; x < p && x > 0; x++ { + prevrev(strconv.Itoa(x), x, false) + } + + // вперёд + for x := p; x <= p+6 && c.Pages > p+6; x++ { + if x == p { + prevrev("", x, true) + x++ } - prevrev(strconv.Itoa(i), i, onPage) - x++ + if x > p { + prevrev(strconv.Itoa(x), x, false) + } } } + // вперёд-назад if c.More { prevrev("| Next =>", p+1, false) } diff --git a/app/wrapper.go b/app/wrapper.go old mode 100755 new mode 100644 index ef1fb31..ca39af7 --- a/app/wrapper.go +++ b/app/wrapper.go @@ -1,6 +1,10 @@ package app import ( + "encoding/json" + "io" + "net/http" + "net/url" "regexp" "strconv" "strings" @@ -10,6 +14,77 @@ import ( "golang.org/x/net/html" ) +var wr = io.WriteString +var Templates = make(map[string]string) + +type skunkyart struct { + Writer http.ResponseWriter + + Args url.Values + BasePath string + Type rune + Query, QueryRaw string + Page int + Atom bool + + Templates struct { + About struct { + Proxy bool + Nsfw bool + Instances []struct { + Title string + Country string + Urls []struct { + I2P string `json:"i2p"` + Ygg string + Tor string + Clearnet string + } + Settings struct { + Nsfw bool + Proxy bool + } + } + } + + SomeList string + Deviation struct { + Post devianter.Post + Related string + StringTime string + Tags string + Comments string + } + + GroupUser struct { + GR devianter.GRuser + Admins string + Group bool + CreationDate string + + About struct { + A devianter.About + + DescriptionFormatted string + Interests, Social string + Comments string + BG string + BGMeta devianter.Deviation + } + + Gallery struct { + Folders string + Pages int + List string + } + } + Search struct { + Content devianter.Search + List string + } + } +} + func (s skunkyart) GRUser() { if len(s.Query) < 1 { s.ReturnHTTPError(400) @@ -17,16 +92,8 @@ func (s skunkyart) GRUser() { } var g devianter.Group - var daError devianter.Error g.Name = s.Query - var err error - s.Templates.GroupUser.GR, err, daError = g.Get() - try(err) - if daError.RAW != nil { - s.Error(daError) - return - } - + s.Templates.GroupUser.GR = g.GroupFunc() group := &s.Templates.GroupUser switch s.Type { @@ -36,15 +103,17 @@ func (s skunkyart) GRUser() { for _, x := range g.Gruser.Page.Modules { switch x.Name { case "about", "group_about": - if g.Owner.Group { + switch g.Owner.Group { + case true: var about = &x.ModuleData.GroupAbout group.Group = true group.CreationDate = x.ModuleData.GroupAbout.FoundatedAt.UTC().String() group.About.DescriptionFormatted = ParseDescription(about.Description) - } else if false { + case false: group.About.A = x.ModuleData.About var about = &group.About.A group.CreationDate = time.Unix(time.Now().Unix()-x.ModuleData.About.RegDate, 0).UTC().String() + group.About.DescriptionFormatted = ParseDescription(about.Description) for _, val := range x.ModuleData.About.SocialLinks { @@ -66,7 +135,12 @@ func (s skunkyart) GRUser() { group.About.Interests += interest.String() } } - group.About.Comments = s.ParseComments(devianter.GetComments(strconv.Itoa(group.GR.Gruser.ID), "", s.Page, 4)) + group.About.Comments = s.ParseComments(devianter.CommentsFunc( + strconv.Itoa(group.GR.Gruser.ID), + "", + s.Page, + 4, + )) case "cover_deviation": group.About.BGMeta = x.ModuleData.CoverDeviation.Deviation @@ -81,77 +155,56 @@ func (s skunkyart) GRUser() { } } - case 'g', 'f': - var all bool - var content devianter.Group - + case 'g': folderid, _ := strconv.Atoi(s.Args.Get("folder")) - - if a := s.Args.Get("all"); a == "true" { - all = true - } - if s.Page == 0 { s.Page++ } - if s.Type == 'f' { - content, daError = g.Favourites(s.Page, all, folderid) - } else { - content, err, daError = g.Gallery(s.Page, folderid) - try(err) - } - - 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, + gallery := g.Gallery(s.Page, folderid) + if folderid > 0 { + group.Gallery.List = s.DeviationList(gallery.Content.Results, DeviationList{ + More: gallery.Content.HasMore, }) } else { - for _, x := range content.Content.Gruser.Page.Modules { + for _, x := range gallery.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 { - if x.FolderId != -1 && x.Size != 0 { - folders.WriteString(`
`) + folders.WriteString(`
`) - if !(x.Thumb.NSFW && !CFG.Nsfw) { - folders.WriteString(``) - } else { - folders.WriteString(`

[ NSFW ]

`) - } - folders.WriteString("
") - - folders.WriteString(``) - folders.WriteString(x.Name) - folders.WriteString(``) - - folders.WriteString("
") + if !(x.Thumb.NSFW && !CFG.Nsfw) { + folders.WriteString(``) + } else { + folders.WriteString(`

[ NSFW ]

`) } + folders.WriteString("
") + + folders.WriteString(``) + folders.WriteString(x.Name) + folders.WriteString(``) + + folders.WriteString("
") } folders.WriteString(`

# Content

`) group.Gallery.Folders = folders.String() } if x.Name == "folder_deviations" { - group.Gallery.List = s.DeviationList(x.ModuleData.Folder.Deviations, true, DeviationList{ + group.Gallery.List = s.DeviationList(x.ModuleData.Folder.Deviations, DeviationList{ Pages: x.ModuleData.Folder.Pages, More: x.ModuleData.Folder.HasMore, }) @@ -163,113 +216,77 @@ func (s skunkyart) GRUser() { } if !s.Atom { - s.ExecuteTemplate("gruser.htm", "html", &s) + s.ExecuteTemplate("gruser.htm", &s) } } // посты func (s skunkyart) Deviation(author, postname string) { id_search := regexp.MustCompile("[0-9]+").FindAllString(postname, -1) - if len(id_search) < 1 { - s.ReturnHTTPError(400) - return - } + if len(id_search) >= 1 { + post := &s.Templates.Deviation - var err devianter.Error - post := &s.Templates.Deviation + id := id_search[len(id_search)-1] + post.Post = devianter.DeviationFunc(id, author) - id := id_search[len(id_search)-1] - 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) - } - - for _, x := range post.Post.Deviation.Extended.RelatedContent { - if len(x.Deviations) != 0 { - post.Related += s.DeviationList(x.Deviations, false) + 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) + } + } + + // хештэги + for _, x := range post.Post.Deviation.Extended.Tags { + var tag strings.Builder + tag.WriteString(` #`) + tag.WriteString(x.Name) + tag.WriteString("") + + post.Tags += tag.String() + } + + if post.Post.Comments.Total <= 50 { + post.Post.Comments.Cursor = "" + } + + post.Comments = s.ParseComments(devianter.CommentsFunc(id, post.Post.Comments.Cursor, s.Page, 1)) + + s.ExecuteTemplate("deviantion.htm", &s) + } else { + s.ReturnHTTPError(400) } - - // хештэги - for _, x := range post.Post.Deviation.Extended.Tags { - var tag strings.Builder - tag.WriteString(` #`) - tag.WriteString(x.Name) - tag.WriteString("") - - post.Tags += tag.String() - } - - 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", "html", &s) } func (s skunkyart) DD() { - 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(`

# `) - strips.WriteString(x.Title) - strips.WriteString(`

`) - - strips.WriteString(s.DeviationList(x.Deviations, false)) - } - s.Templates.DDStrips = strips.String() - s.Templates.SomeList = s.DeviationList(dd.Deviations, true, DeviationList{ + dd := devianter.DailyDeviationsFunc(s.Page) + s.Templates.SomeList = s.DeviationList(dd.Deviations, DeviationList{ Pages: 0, More: dd.HasMore, }) if !s.Atom { - s.ExecuteTemplate("daily.htm", "html", &s) + s.ExecuteTemplate("list.htm", &s) } } func (s skunkyart) Search() { - if s.Query == "" { - s.ReturnHTTPError(400) - return - } - - var err error - var daError devianter.Error + s.Atom = false + var e error ss := &s.Templates.Search switch s.Type { case 'a', 't': - ss.Content, err, daError = devianter.PerformSearch(s.Query, s.Page, s.Type) - case 'g', 'f': - ss.Content, err, daError = devianter.PerformSearch(s.Query, s.Page, s.Type, s.Args.Get("usr")) + ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type) + case 'g': + ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type, s.Args.Get("usr")) case 'r': // скраппер, поскольку девиантартовцы зажопили гостевое API для поиска групп var ( usernames = make(map[int]string) @@ -315,34 +332,34 @@ func (s skunkyart) Search() { } default: s.ReturnHTTPError(400) - return } - try(err) + try(e) if s.Type != 'r' { - if daError.RAW != nil { - s.Error(daError) - return - } - - ss.List = s.DeviationList(ss.Content.Results, false, DeviationList{ + ss.List = s.DeviationList(ss.Content.Results, DeviationList{ Pages: ss.Content.Pages, More: ss.Content.HasMore, }) } - s.ExecuteTemplate("search.htm", "html", &s) + s.ExecuteTemplate("search.htm", &s) } func (s skunkyart) Emojitar(name string) { - if name == "" || !(s.Type == 'a' || s.Type == 'e') { + if name != "" && (s.Type == 'a' || s.Type == 'e') { + ae, e := devianter.AEmedia(name, s.Type) + if e != nil { + s.ReturnHTTPError(404) + } + wr(s.Writer, ae) + } else { s.ReturnHTTPError(400) - return } - - ae, e := devianter.AEmedia(name, s.Type) - if e != nil { - s.ReturnHTTPError(404) - } - wr(s.Writer, ae) +} + +func (s skunkyart) About() { + s.Templates.About.Nsfw = CFG.Nsfw + s.Templates.About.Proxy = CFG.Proxy + try(json.Unmarshal([]byte(Templates["instances.json"]), &s.Templates.About)) + s.ExecuteTemplate("about.htm", &s) } diff --git a/compose.example.yaml b/compose.example.yaml deleted file mode 100755 index 5eead70..0000000 --- a/compose.example.yaml +++ /dev/null @@ -1,12 +0,0 @@ -services: - skunkyart: - container_name: skunkyart - restart: unless-stopped - build: . - ports: - - "127.0.0.1:3003:3003" - security_opt: - - no-new-privileges:true - volumes: - - ./config.json:/config.json:ro - - ./cache:/cache # Ensure cache folder has a 10000:10000 ownership. diff --git a/config.example.json b/config.example.json old mode 100755 new mode 100644 index 70e1c1b..1a78535 --- a/config.example.json +++ b/config.example.json @@ -1,17 +1,18 @@ { "listen": "0.0.0.0:3003", - "uri": "/", + "base-path": "/", "cache": { "enabled": true, - "path": "cache", + "path": "/home/skunk/projects/skunkyart/cache", "lifetime": null, - "max-size": 200, - "memcache": false, + "max-size": 100000, "update-interval": 5 }, - "static-path": "static", - "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", + "dirs-to-memory": [ + "/home/skunk/projects/skunkyart/html", + "/home/skunk/projects/skunkyart/css" + ], + "download-proxy": null, "proxy": true, "nsfw": false } diff --git a/static/css/skunky.css b/css/skunky.css old mode 100755 new mode 100644 similarity index 62% rename from static/css/skunky.css rename to css/skunky.css index 09cc71c..9d041f0 --- a/static/css/skunky.css +++ b/css/skunky.css @@ -1,6 +1,6 @@ /* TAGS */ html { - font-family: ubuntu, system-ui; + font-family: Ubuntu; background-color:black; color: rgb(234, 216, 216); } @@ -19,21 +19,15 @@ header h1 { header form { align-self: center; } -header, form { +header { display: flex; } -form { - border: solid #164e3e 1px; - max-width: fit-content; -} form input, button, select { background-color: #134134; padding: 5px; color: whitesmoke; - border: 0; -} -input:focus { - outline: none; + border: 0px; + border-radius: 1px; } /* BLOCKS */ @@ -45,22 +39,24 @@ input:focus { justify-content: center; } .block { - padding: 0px 0px 6px 0px; - border: 3px solid #000; + max-width: 20%; + height: 0%; + padding: 4px; + border-radius: 2px; + border: 3px solid #091f19; 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; } @@ -135,77 +131,28 @@ input:focus { } /* SCREEN OPTIMISATIONS */ -@media (orientation: portrait) { - * { - font-size: 120% - } - - ul { - font-size: 80% - } - +@media screen and (orientation: portrait) { header { - margin-left: 3%; - text-align: center; - display: inline-block; - clear: both; - font-size: 200%; + scale: 155%; + justify-content: center; } - - form { - font-size: 60%; - border: solid #164e3e 5px; - } - .content { margin: auto; display: inherit; scale: 100%; } .block { - margin-top: 10%; - max-width: 200%; - } - .folder-item { - width: 25% - } - .folders { - display: flexbox; - justify-content: center - } - figure img { - width: 10% - } - figure a img { - width: 100% - } - .msg { - font-size: 60%; - max-width: 80% - } - .block img, .plates .user-plate img { - width: 100%; + max-width: 60%; } } -@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) { +@media screen and (max-width: 1462px) { .block { max-width: 30%; } } -@media (min-width: 788px) and (max-width: 884px) { +@media screen and (min-width: 788px) and (max-width: 884px) { .block { max-width: 35%; } diff --git a/go.mod b/go.mod old mode 100755 new mode 100644 index 3cda61a..4000554 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module skunkyart -go 1.18 +go 1.22.3 require ( - git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133 + git.macaw.me/skunky/devianter v0.2.0 golang.org/x/net v0.27.0 ) diff --git a/go.sum b/go.sum old mode 100755 new mode 100644 index 323fd90..59de12e --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133 h1:ziutYUyDmdbsptR8Lj4lNmZUxfgwGsNbHM1mO9ATph8= -git.macaw.me/skunky/devianter v0.2.6-0.20240904171839-b3c99749f133/go.mod h1:ZLn527xBlnpXrUB1B8z/MhyeiWVK4nPWjyfnhWOE8Is= +git.macaw.me/skunky/devianter v0.2.0 h1:2vnMPb1Dax37CbAOfmHcSoK8+1goFkWHbtbh31Ytsww= +git.macaw.me/skunky/devianter v0.2.0/go.mod h1:ZLn527xBlnpXrUB1B8z/MhyeiWVK4nPWjyfnhWOE8Is= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= diff --git a/html/about.htm b/html/about.htm new file mode 100644 index 0000000..54e5418 --- /dev/null +++ b/html/about.htm @@ -0,0 +1,63 @@ + + + + SkunkyArt + + +
+
+

HOME | DD

+
+ + + +
+
+

+ SkunkyArt is an alternative frontend for deviantart.com, written in Go. +

+

Room in Matrix

+

Instance settings:

+ +

Instances:

+ +

Copyright lost+skunk, X11. SkunkyArt v1.3

+
+ \ No newline at end of file diff --git a/static/html/deviantion.htm b/html/deviantion.htm old mode 100755 new mode 100644 similarity index 74% rename from static/html/deviantion.htm rename to html/deviantion.htm index f357dd7..c00c1ae --- a/static/html/deviantion.htm +++ b/html/deviantion.htm @@ -1,8 +1,23 @@ - {{template "head" . }} + + SkunkyArt | {{.Templates.Deviation.Post.Deviation.Author.Username}} - {{.Templates.Deviation.Post.Deviation.Title}} + + +
- {{template "header" . }} +
+

HOME | DD

+
+ + + +
+
{{.Templates.Deviation.Post.Deviation.Author.Username}} — {{if (.Templates.Deviation.Post.Deviation.DD)}} diff --git a/static/html/gruser.htm b/html/gruser.htm old mode 100755 new mode 100644 similarity index 77% rename from static/html/gruser.htm rename to html/gruser.htm index 4e8e3d1..ee7de73 --- a/static/html/gruser.htm +++ b/html/gruser.htm @@ -1,27 +1,25 @@ - {{template "head" . }} + + SkunkyArt | + {{if eq .Type 'a'}} + {{.Templates.GroupUser.GR.Owner.Username}} + {{else}} + gallery of {{.Templates.GroupUser.GR.Owner.Username}} + {{end}} + + +
-

- HOME - | DD - {{if ne .Type 'f'}} - | Gallery{{else}}about">About{{end}} - | Favourites - {{else}} - | About - | Gallery - | Favourites - {{end}} - | RSS -

+

HOME | DD + | Gallery{{else}}about">About{{end}} + | RSS

+ + +
+

Daily Deviations | About | Source Code

+ +
+ \ No newline at end of file diff --git a/html/list.htm b/html/list.htm new file mode 100644 index 0000000..b2472c4 --- /dev/null +++ b/html/list.htm @@ -0,0 +1,22 @@ + + + + SkunkyArt + + +
+
+

HOME | DD | RSS

+
+ + + +
+
+ {{.Templates.SomeList}} +
+ \ No newline at end of file diff --git a/html/search.htm b/html/search.htm new file mode 100644 index 0000000..fee5ada --- /dev/null +++ b/html/search.htm @@ -0,0 +1,29 @@ + + + + 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 old mode 100755 new mode 100644 index ceec4f6..ebb75c2 --- a/instances.json +++ b/instances.json @@ -1,82 +1,49 @@ { "instances": [ { - "title": "lost-skunk.cc", - "country": "Finland", - "urls": { - "ygg": "http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart", - "clearnet": "https://lost-skunk.cc/skunkyart" - }, + "title": "skunky.ebloid.ru", + "country": "Russia", + "urls": [{ + "ygg": "http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art", + "clearnet": "https://skunky.ebloid.ru/art" + }], "settings": { - "proxy": true, - "nsfw": false + "nsfw": false, + "proxy": false } }, { - "title": "orehus.club", - "country": "Germany", - "urls": { - "clearnet": "https://sa.orehus.club" - }, + "title": "clovius.club", + "country": "Sweden", + "urls": [{ + "clearnet": "https://skunky.clovius.club" + }], "settings": { - "proxy": false, - "nsfw": true + "nsfw": true, + "proxy": true } }, { "title": "bloat.cat", - "country": "Germany", - "urls": { + "country": "Romania", + "urls": [{ "clearnet": "https://skunky.bloat.cat" - }, + }], "settings": { - "proxy": true, - "nsfw": true + "nsfw": true, + "proxy": true } }, { - "title": "lumaeris.com", - "country": "Germany", - "urls": { - "clearnet": "https://skunkyart.lumaeris.com" - }, + "title": "frontendfriendly.xyz", + "country": "Finland", + "urls": [{ + "clearnet": "https://skunkyart.frontendfriendly.xyz" + }], "settings": { - "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 - } - }, - { - "title": "opnxng.com", - "country": "Singapore", - "urls": { - "clearnet": "https://da.opnxng.com" - }, - "settings": { - "proxy": true, - "nsfw": true + "nsfw": true, + "proxy": true } } ] -} +} \ No newline at end of file diff --git a/main.go b/main.go old mode 100755 new mode 100644 index d7009ae..43b95f0 --- a/main.go +++ b/main.go @@ -2,30 +2,17 @@ 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() - static.CopyTemplatesToMemory() - - go func() { - for { - err := devianter.UpdateCSRF() - if err != nil { - println(err.Error()) - } - time.Sleep(12 * time.Hour) - } - }() + app.CopyTemplatesToMemory() + err := devianter.UpdateCSRF() + if err != nil { + println(err.Error()) + } app.Router() } diff --git a/services/skunkyart.example.openrc b/services/skunkyart.example.openrc deleted file mode 100755 index 9309251..0000000 --- a/services/skunkyart.example.openrc +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -supervisor=supervise-daemon -user=skunkyart:skunkyart -name=SkunkyArt -directory=/opt/skunkyart -command=$directory/bin/skunkyart -description="Privacy-oriented frontend for DeviantArt" -error_logger=logger -output_logger=logger -no_new_privs=true -umask=0077 - -# if you use old version openrc, uncomment function lower -# start_pre() { -# cd $directory -# } - -depend() { - need net localmount bootmisc -} \ No newline at end of file diff --git a/services/skunkyart.example.service b/services/skunkyart.example.service deleted file mode 100755 index 2699d83..0000000 --- a/services/skunkyart.example.service +++ /dev/null @@ -1,11 +0,0 @@ -# Note: i didn't use systemd, so it can be not works :) - -[Unit] -Description=Privacy-oriented frontend for DeviantArt - -[Service] -Directory= -ExecStart= - -[Install] -WantedBy=multi-user.target diff --git a/skunkyart.example.openrc b/skunkyart.example.openrc new file mode 100755 index 0000000..aba74ce --- /dev/null +++ b/skunkyart.example.openrc @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +name="SkunkyArt" +description="Privacy frontend for deviantart.com" +supervisor=supervise-daemon +command= +command_args="-c " +directory="" + +depend() { + need net +} \ No newline at end of file diff --git a/static/html/about.htm b/static/html/about.htm deleted file mode 100755 index ae2da3f..0000000 --- a/static/html/about.htm +++ /dev/null @@ -1,49 +0,0 @@ - - - {{template "head" .}} -
- {{template "header" .}} -

- SkunkyArt is an alternative frontend for deviantart.com, written in Go. -

-

Room in [matrix]

- Instance settings: -
    -
  • NSFW: {{if .Templates.About.Nsfw}}YES{{else}}NO{{end}}
    • -
  • Proxyfing: {{if .Templates.About.Proxy}}YES{{else}}NO{{end}}
    • -
-
- Instances: -
    - {{range .Templates.About.Instances}} -
  • {{.Title}}: -
      -
    • Country: {{.Country}}
      • -
    • URLs:
      • -
        - {{if ne .Urls.I2P ""}} -
      • I2P: Yes
        • - {{end}} - {{if ne .Urls.Ygg ""}} -
      • Ygg: Yes
        • - {{end}} - {{if ne .Urls.Tor ""}} -
      • Tor: Yes
        • - {{end}} - {{if ne .Urls.Clearnet ""}} -
      • Clearnet: {{.Urls.Clearnet}}
        • - {{end}} -
      -
    • Settings:
      • -
        -
      • NSFW: {{if .Settings.Nsfw}}YES{{else}}NO{{end}}
        • -
      • Proxyfing: {{if .Settings.Proxy}}YES{{else}}NO{{end}}
        • -
      -
    -
    • - {{end}} -
-
-

Copyright lost+skunk, X11. SkunkyArt v{{.Version}}

-
- diff --git a/static/html/daily.htm b/static/html/daily.htm deleted file mode 100755 index b3b6044..0000000 --- a/static/html/daily.htm +++ /dev/null @@ -1,13 +0,0 @@ - - - {{template "head" . }} -
- {{template "header" . }} - {{if ne .Templates.DDStrips ""}} -

# Strips

- {{.Templates.DDStrips}} - {{end}} -

# Content

- {{.Templates.SomeList}} -
- \ No newline at end of file diff --git a/static/html/head.htm b/static/html/head.htm deleted file mode 100755 index aa36c73..0000000 --- a/static/html/head.htm +++ /dev/null @@ -1,26 +0,0 @@ -{{define "head"}} - - SkunkyArt | - {{if eq .Endpoint "search"}} - "{{.QueryRaw}}" - {{else if eq .Endpoint "post"}} - {{.Templates.Deviation.Post.Deviation.Author.Username}} — {{.Templates.Deviation.Post.Deviation.Title}} - {{else if eq .Endpoint "group_user"}} - {{if eq .Type 'g'}} - gallery of - {{else if eq .Type 'f'}} - favourites of - {{end}} - {{.Templates.GroupUser.GR.Owner.Username}} - {{else}} - {{.Endpoint}} - {{end}} - - - - - - - - -{{end}} \ No newline at end of file diff --git a/static/html/header.htm b/static/html/header.htm deleted file mode 100755 index f8537a3..0000000 --- a/static/html/header.htm +++ /dev/null @@ -1,14 +0,0 @@ -{{define "header"}} -
-

HOME | DD {{if eq .Endpoint "dd"}}| RSS{{end}}

-
- - - -
-
-{{end}} \ No newline at end of file diff --git a/static/html/index.htm b/static/html/index.htm deleted file mode 100755 index 219bb97..0000000 --- a/static/html/index.htm +++ /dev/null @@ -1,90 +0,0 @@ - - - - SkunkyArt - - - - - - -
- -
-

Daily Deviations | About

-
- - - -
-

- SkunkyArt -

-
-
- \ No newline at end of file diff --git a/static/html/search.htm b/static/html/search.htm deleted file mode 100755 index 74bbd38..0000000 --- a/static/html/search.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - {{template "head" . }} -
- {{template "header" . }} - - {{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/static/images/logo.png b/static/images/logo.png deleted file mode 100755 index e895de7..0000000 Binary files a/static/images/logo.png and /dev/null differ diff --git a/static/templates-noembed.go b/static/templates-noembed.go deleted file mode 100755 index 7a3c541..0000000 --- a/static/templates-noembed.go +++ /dev/null @@ -1,148 +0,0 @@ -//go:build !embed -// +build !embed - -package static - -import ( - "bytes" - "io/fs" - "os" - "strings" - "time" -) - -var Templates FS - -type file struct { - path string - name string - content []byte -} - -var templateNames = []string{} -var templates = make(map[string][]file) -var StaticPath string - -func CopyTemplatesToMemory() { - baseDir, err := os.ReadDir(StaticPath) - try(err) - - for _, c := range baseDir { - if c.IsDir() { - templateNames = append(templateNames, c.Name()) - - var filePath strings.Builder - filePath.WriteString(StaticPath) - filePath.WriteString("/") - filePath.WriteString(c.Name()) - - dir, err := os.ReadDir(filePath.String()) - try(err) - - filePath.WriteString("/") - for _, cd := range dir { - f, err := os.ReadFile(filePath.String() + cd.Name()) - try(err) - templates[c.Name()] = append(templates[c.Name()], file{ - content: f, - name: cd.Name(), - path: c.Name() + "/" + cd.Name(), - }) - } - } - } -} - -type FS struct{} - -func (FS) Open(name string) (fs.File, error) { - for i, l := 0, len(templateNames); i < l; i++ { - for _, x := range templates[templateNames[i]] { - if x.content != nil && name == x.path { - return &File{ - name: x.path, - content: bytes.NewBuffer(x.content), - }, nil - } - } - } - return nil, &fs.PathError{} -} - -func (FS) Glob(pattern string) ([]string, error) { - trimmed := strings.Split(pattern, "/") - var matches = []string{} - for x, s := range templates { - for i, l := 0, len(s); i < l && trimmed[0] == x; i++ { - s := s[i] - matches = append(matches, s.path) - } - } - if len(matches) != 0 { - return matches, nil - } - return nil, &fs.PathError{} -} - -func try(err error) { - if err != nil { - println(err.Error()) - os.Exit(1) - } -} - -/* сделано на основе https://github.com/psanford/memfs; требуется для корректной работы templates.ParseFS */ -type fileInfo struct { - name string -} - -func (fi fileInfo) Name() string { - return fi.name -} - -func (fi fileInfo) Size() int64 { - return 4096 -} - -func (fileInfo) Mode() fs.FileMode { - return 0 -} - -func (fileInfo) ModTime() time.Time { - return time.Time{} -} - -func (fileInfo) IsDir() bool { - return false -} - -func (fileInfo) Sys() interface{} { - return nil -} - -type File struct { - name string - content *bytes.Buffer - closed bool -} - -func (f *File) Stat() (fs.FileInfo, error) { - return fileInfo{ - name: f.name, - }, nil -} - -func (f *File) Read(b []byte) (int, error) { - if f.closed { - return 0, fs.ErrClosed - } - return f.content.Read(b) -} - -func (f *File) Close() error { - if f.closed { - return fs.ErrClosed - } - f.closed = true - return nil -} diff --git a/static/templates.go b/static/templates.go deleted file mode 100755 index 28a057a..0000000 --- a/static/templates.go +++ /dev/null @@ -1,16 +0,0 @@ -//go:build embed -// +build embed - -package static - -import "embed" - -//go:embed * -var Templates embed.FS -var Enabled bool = true - -var StaticPath string - -func CopyTemplatesToMemory() { - _ = StaticPath -}