diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..6833fbe
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+cache
+compose.yaml
+*.json
+LICENSE
+*.md
+services
diff --git a/.gitignore b/.gitignore
index b52ba21..63ca398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
**/cache
+**/compose.yaml
**/config.json
**/skunkyart
**/skunkyart-*
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..fdc1919
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,23 @@
+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
index 32b0e50..e5fffdd 100644
--- a/INSTANCES.md
+++ b/INSTANCES.md
@@ -2,8 +2,9 @@ JSON variant should be used from master — https://git.macaw.me/skunky/SkunkyAr
|Instance|Yggdrasil|I2P|Tor|NSFW|Proxifying|Modified Sources|Country|
|:------:|:-------:|:-:|:-:|:--:|:--------:|:--------------:|:-----:|
-|[skunky.ebloid.ru](https://skunky.ebloid.ru/art)|[Yes](http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art)|No|No| No | Yes | No | Russia |
-|[clovius.club](https://skunky.clovius.club)|No|No|No| Yes | Yes | No | Sweden |
+|[lost-skunk.cc](https://lost-skunk.cc/skunkyart)|[Yes](http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart)|No|No| No | Yes | No | Germany |
+|[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 |
\ No newline at end of file
+|[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 |
\ No newline at end of file
diff --git a/README.md b/README.md
index b61b0bd..e5f404d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
+> [!NOTE]
+> Currently, due to school, I cannot actively develop this project :(
+> However, this does not mean that development has stopped. Just wait for the summer. For questions, write either to the Matrix room or to me in DM.
+
-[](https://go.kde.org/matrix/#/#skunkyart:ebloid.ru)
+[](https://go.kde.org/matrix/#/#skunkyart:gnulinux.club)
Instances: [`INSTANCES.md`](/skunky/SkunkyArt/src/branch/master/INSTANCES.md)
@@ -21,6 +25,7 @@ To do this, you must either make a PR by adding your instance to the `instances.
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
@@ -41,5 +46,6 @@ SkunkyArt 🦨 — альтернативный фронтенд к DeviantArt,
1. Инстанс не должен использовать Cloudflare итп.
2. Если ваш инстанс имеет модифицированный исходный код, то вам нужно опубликовать его на любую свободную площадку. Например, Github и Gitlab таковыми не являются.
## Благодарности
+* [vlnst](https://git.bloat.cat/vlnst) — написал Docker-файл.
* [Лис⚛](https://go.kde.org/matrix/#/@fox:matrix.org) — помог разобраться в Go и много чего полезного посоветовал по этому языку.
* [meoww](https://codeberg.org/meoww) — перевела некоторые предложения на английский язык и написала сервис для openrc
\ No newline at end of file
diff --git a/app/api.go b/app/api.go
index 048bc2a..d2a5655 100644
--- a/app/api.go
+++ b/app/api.go
@@ -41,12 +41,18 @@ func (a API) Error(description string, status int) {
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)
}
}
diff --git a/app/cache.go b/app/cache.go
index f9225be..e03db67 100644
--- a/app/cache.go
+++ b/app/cache.go
@@ -38,17 +38,7 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) {
fileName := sha1.Sum([]byte(subdomain + path))
filePath := CFG.Cache.Path + "/" + hex.EncodeToString(fileName[:])
- 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 := func() {
file, err := os.Open(filePath)
if err != nil {
if dwnld := Download(url.String()); dwnld.Status == 200 && dwnld.Headers["Content-Type"][0][:5] == "image" {
@@ -63,27 +53,44 @@ func (s skunkyart) DownloadAndSendMedia(subdomain, path string) {
try(e)
response = file
}
+ }
- go func() {
- defer restore()
+ if CFG.Cache.MemCache {
+ mx.Lock()
+ if tempFS[fileName] == nil {
+ tempFS[fileName] = &file{}
+ }
+ mx.Unlock()
- mx.RLock()
- tempFS[fileName].Content = response
- mx.RUnlock()
+ if tempFS[fileName].Content != nil {
+ response = tempFS[fileName].Content
+ tempFS[fileName].Score += 2
+ break
+ } else {
+ c()
+ go func() {
+ defer restore()
- for {
- time.Sleep(1 * time.Minute)
+ mx.RLock()
+ tempFS[fileName].Content = response
+ mx.RUnlock()
- mx.Lock()
- if tempFS[fileName].Score <= 0 {
- delete(tempFS, fileName)
+ for {
+ time.Sleep(1 * time.Minute)
+
+ mx.Lock()
+ if tempFS[fileName].Score <= 0 {
+ delete(tempFS, fileName)
+ mx.Unlock()
+ return
+ }
+ tempFS[fileName].Score--
mx.Unlock()
- return
}
- tempFS[fileName].Score--
- mx.Unlock()
- }
- }()
+ }()
+ }
+ } else {
+ c()
}
case CFG.Proxy:
dwnld := Download(url.String())
@@ -112,6 +119,7 @@ func InitCacheSystem() {
println(err.Error())
}
+ var total int64
for _, file := range dir {
fileName := c.Path + "/" + file.Name()
fileInfo, err := file.Info()
@@ -128,9 +136,15 @@ func InitCacheSystem() {
}
}
- if c.MaxSize != 0 && fileInfo.Size() > c.MaxSize {
- 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/config.go b/app/config.go
index 2ba39a9..813453c 100644
--- a/app/config.go
+++ b/app/config.go
@@ -12,12 +12,13 @@ import (
)
var Release struct {
- Version string
+ Version string
Description string
}
type cache_config struct {
Enabled bool
+ MemCache bool `json:"memcache"`
Path string
MaxSize int64 `json:"max-size"`
Lifetime string
@@ -93,9 +94,9 @@ func ExecuteConfig() {
About = instanceAbout{
Proxy: CFG.Proxy,
- Nsfw: CFG.Nsfw,
+ Nsfw: CFG.Nsfw,
}
-
+
static.StaticPath = CFG.StaticPath
devianter.UserAgent = CFG.UserAgent
}
diff --git a/app/parsers.go b/app/parsers.go
index b7f15fd..192a88d 100644
--- a/app/parsers.go
+++ b/app/parsers.go
@@ -46,7 +46,7 @@ func (s skunkyart) ParseComments(c devianter.Comments, daError devianter.Error)
if x.Parent > 0 {
cmmts.WriteString(` In reply to `)
diff --git a/app/router.go b/app/router.go
index eddf0a9..ac65c3d 100644
--- a/app/router.go
+++ b/app/router.go
@@ -9,7 +9,7 @@ import (
"strings"
)
-var Host, Path string
+var Host string
func Router() {
parsepath := func(path string) map[int]string {
@@ -54,15 +54,14 @@ func Router() {
// функция, что управляет всем
handle := func(w http.ResponseWriter, r *http.Request) {
- Path = r.URL.Path
- path := parsepath(Path)
+ 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
}
var skunky = skunkyart{Version: Release.Version}
+ skunky._pth = r.URL.Path
skunky.Args = r.URL.Query()
arg := skunky.Args.Get
diff --git a/app/util.go b/app/util.go
index 9c8d400..6ece2e8 100644
--- a/app/util.go
+++ b/app/util.go
@@ -63,6 +63,7 @@ type instanceAbout struct {
type skunkyart struct {
Writer http.ResponseWriter
+ _pth string
Args url.Values
Page int
@@ -274,7 +275,7 @@ func (s skunkyart) NavBase(c DeviationList) string {
prevrev := func(msg string, page int, onpage bool) {
if !onpage {
list.WriteString(`NSFW content are disabled on this instance.