Add sa.dc09.ru

Reviewed-on: https://git.macaw.me/skunky/SkunkyArt/pulls/6

.dockerignore

@@ -0,0 +1,6 @@
+cache
+compose.yaml
+*.json
+LICENSE
+*.md
+services

.gitignore

@@ -1,4 +1,5 @@
 **/cache
+**/compose.yaml
 **/config.json
 **/skunkyart
 **/skunkyart-*

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"]

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 |
+|[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 |

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.
+
 <img src="static/images/logo.png" alt="SkunkyArt" title="SkunkyArt Logo" width="20%" loading="lazy"/>
 
-[![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)
+[![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)
 
@@ -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

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)
 	}
 }
 

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))

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
 	}

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 <a href="`)
-			cmmts.WriteString(Path)
+			cmmts.WriteString(s._pth)
 			cmmts.WriteString("#")
 			cmmts.WriteString(strconv.Itoa(x.Parent))
 			cmmts.WriteString(`">`)

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

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(`<a href="`)
-			list.WriteString(Path)
+			list.WriteString(s._pth)
 			list.WriteString(`?p=`)
 			list.WriteString(strconv.Itoa(page))
 			if s.Type != 0 {

app/wrapper.go

@@ -36,13 +36,12 @@ func (s skunkyart) GRUser() {
 		for _, x := range g.Gruser.Page.Modules {
 			switch x.Name {
 			case "about", "group_about":
-				switch g.Owner.Group {
-				case true:
+				if g.Owner.Group {
 					var about = &x.ModuleData.GroupAbout
 					group.Group = true
 					group.CreationDate = x.ModuleData.GroupAbout.FoundatedAt.UTC().String()
 					group.About.DescriptionFormatted = ParseDescription(about.Description)
-				case false:
+				} else if 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()
@@ -186,6 +185,14 @@ func (s skunkyart) Deviation(author, postname string) {
 		return
 	}
 
+	if post.Post.Deviation.NSFW && !CFG.Nsfw {
+		s.Writer.WriteHeader(403)
+		wr(s.Writer, `<html><link rel="stylesheet" href="`+
+			UrlBuilder("stylesheet")+
+			`" /><h1>NSFW content are disabled on this instance.</h1></html>`)
+		return
+	}
+
 	if post.Post.Comments.Total <= 50 {
 		post.Post.Comments.Cursor = ""
 	}

compose.example.yaml

@@ -0,0 +1,12 @@
+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.

config.example.json

@@ -6,11 +6,12 @@
         "path": "cache",
         "lifetime": null,
         "max-size": 200,
+        "memcache": false,
         "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",
     "proxy": true,
-    "nsfw": true
+    "nsfw": false
 }

instances.json

@@ -1,11 +1,11 @@
 {
     "instances": [
         {
-            "title": "skunky.ebloid.ru",
-            "country": "Russia",
+            "title": "lost-skunk.cc",
+            "country": "Germany",
             "urls": {
-                "ygg": "http://[201:eba5:d1fc:bf7b:cfcb:a811:4b8b:7ea3]/art",
-                "clearnet": "https://skunky.ebloid.ru/art"
+                "ygg": "http://[201:f137:d1ac:920e:cd42:bfd1:1e83:da1d]/skunkyart",
+                "clearnet": "https://lost-skunk.cc/skunkyart"
             },
             "settings": {
                 "proxy": true,
@@ -13,13 +13,13 @@
             }
         },
         {
-            "title": "clovius.club",
-            "country": "Sweden",
+            "title": "orehus.club",
+            "country": "Germany",
             "urls": {
-                "clearnet": "https://skunky.clovius.club"
+                "clearnet": "https://sa.orehus.club"
             },
             "settings": {
-                "proxy": true,
+                "proxy": false,
                 "nsfw": true
             }
         },
@@ -55,6 +55,17 @@
                 "proxy": true,
                 "nsfw": true
             }
+        },
+        {
+            "title": "dc09.ru",
+            "country": "Russia",
+            "urls": {
+                "clearnet": "https://sa.dc09.ru"
+            },
+            "settings": {
+                "proxy": true,
+                "nsfw": false
+            }
         }
     ]
 }

static/css/skunky.css

@@ -1,6 +1,6 @@
 /* TAGS */
 html {
-    font-family: Ubuntu;
+    font-family: ubuntu, system-ui;
     background-color:black;
     color: rgb(234, 216, 216);
 }
@@ -45,24 +45,22 @@ input:focus {
     justify-content: center;
 }
 .block {
-    max-width: 20%;
-    height: 0%;
-    padding: 4px;
-    border-radius: 2px;
-    border: 3px solid #091f19;
+    padding: 0px 0px 6px 0px;
+    border: 3px solid #000;
     word-break: break-all;
     background-color: #091f19;
     margin-left: 5px;
     margin-top: 5px;
     text-align: center;
 }
+.block h1 {
+    padding: 8.5vh;
+}
 .block:hover {
     border: 3px solid #4d27d6;
     transition: 400ms;
 }
-.block img, .plates .user-plate img {
-    width: 100%;
-}
+
 .block p {
     word-break: break-all;
 }
@@ -185,6 +183,20 @@ input:focus {
         font-size: 60%;
         max-width: 80%
     }
+    .block img, .plates .user-plate img {
+        width: 100%;
+    }
+}
+
+@media (orientation: landscape) {
+    .block {
+        width: 20%;
+    }
+    .block img, .plates .user-plate img {
+        width: 100%;
+        height: 30vh;
+        object-fit: cover;
+    }
 }
 
 @media (max-width: 1462px) and (orientation: landscape) {

static/html/about.htm

@@ -6,7 +6,7 @@
         <p>
             SkunkyArt is an alternative frontend for deviantart.com, written in Go.
         </p>
-        <h3><a href="https://go.kde.org/matrix/#/#skunkyart:ebloid.ru" target="_blank">Room in [matrix]</a></h3>
+        <h3><a href="https://go.kde.org/matrix/#/#skunkyart:gnulinux.club" target="_blank">Room in [matrix]</a></h3>
         <b>Instance settings:</b>
         <ul>
             <li><b>NSFW</b>: <span class="about-{{.Templates.About.Nsfw}}">{{if .Templates.About.Nsfw}}YES{{else}}NO{{end}}</span></li>
@@ -44,6 +44,6 @@
                 {{end}}
             </ul>
         </details>
-        <p>Copyright <a href="https://go.kde.org/matrix/#/@softpigeones:ebloid.ru" target="_blank">lost+skunk</a>, X11. <a href="https://git.macaw.me/skunky/skunkyart/src/tag/v{{.Version}}" target="_blank">SkunkyArt v{{.Version}}</a></p>
+        <p>Copyright <a href="https://go.kde.org/matrix/#/@ls:gnulinux.club" target="_blank">lost+skunk</a>, X11. <a href="https://git.macaw.me/skunky/skunkyart/src/tag/v{{.Version}}" target="_blank">SkunkyArt v{{.Version}}</a></p>
     </main>
 </html>

static/html/gruser.htm

@@ -30,7 +30,7 @@
             </form> <h1>| {{.Templates.GroupUser.GR.Owner.Username}}</h1>
         </header>
         {{if eq .Type 'a'}}
-            {{if ne .Templates.GroupUser.About.BG ""}}
+            {{if and (and (ne .Templates.About.Nsfw true) (ne .Templates.GroupUser.About.BGMeta.NSFW true)) (ne .Templates.GroupUser.About.BG "")}}
             <a href="{{.Templates.GroupUser.About.BGMeta.Url}}" class="ubg"><img title="{{if ne .Templates.GroupUser.GR.Owner.Username .Templates.GroupUser.About.BGMeta.Author.Username}}
             {{.Templates.GroupUser.About.BGMeta.Author.Username}} - {{end}}{{.Templates.GroupUser.About.BGMeta.Title}}" src="{{.Templates.GroupUser.About.BG}}"></a>
             {{end}}