From 0f528ee9fa8b84c5e7532e22480b8b4b3ff7d5ba Mon Sep 17 00:00:00 2001
From: lost+skunk <skunky@ebloid.ru>
Date: Tue, 9 Jul 2024 12:54:15 +0300
Subject: Поиск по группам
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/util.go | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

(limited to 'app/util.go')

diff --git a/app/util.go b/app/util.go
index eb1c7ce..645ceb4 100644
--- a/app/util.go
+++ b/app/util.go
@@ -66,12 +66,35 @@ func (s skunkyart) ConvertDeviantArtUrlToSkunkyArt(url string) (output string) {
 	return
 }
 
+func BuildUserPlate(name string) string {
+	var htm strings.Builder
+	htm.WriteString(`<div class="user-plate"><img src="`)
+	htm.WriteString(UrlBuilder("media", "emojitar", name, "?type=a"))
+	htm.WriteString(`"><a href="`)
+	htm.WriteString(UrlBuilder("group_user", "?type=about&q=", name))
+	htm.WriteString(`">`)
+	htm.WriteString(name)
+	htm.WriteString(`</a></div>`)
+	return htm.String()
+}
+
 type text struct {
 	TXT  string
 	from int
 	to   int
 }
 
+func tagval(t *html.Tokenizer) string {
+	for tt := t.Next(); ; {
+		switch tt {
+		default:
+			return ""
+		case html.TextToken:
+			return string(t.Text())
+		}
+	}
+}
+
 func ParseDescription(dscr devianter.Text) string {
 	var parseddescription strings.Builder
 	TagBuilder := func(tag string, content string) string {
@@ -182,20 +205,7 @@ func ParseDescription(dscr devianter.Text) string {
 			}
 		}
 	} else if dl != 0 {
-		tagval := func(t *html.Tokenizer) string {
-			for {
-				tt := t.Next()
-				switch tt {
-				case html.ErrorToken:
-					return ""
-				case html.TextToken:
-					return string(t.Text())
-				}
-			}
-		}
-
-		tt := html.NewTokenizer(strings.NewReader(dscr.Html.Markup))
-		for {
+		for tt := html.NewTokenizer(strings.NewReader(dscr.Html.Markup)); ; {
 			t := tt.Next()
 			switch t {
 			case html.ErrorToken:
@@ -314,7 +324,7 @@ func (s skunkyart) NavBase(c dlist) string {
 	}
 
 	// вперёд-назад
-	if c.More {
+	if p != 417 || c.More {
 		prevrev("| Next =>", p+1, false)
 	}
 
-- 
cgit v1.2.3