0f528ee9fa · krz/skunky-art

app/util.go +25 −15

 	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 {
 			}
 		}
 	} else if dl != 0 {
-		tagval := func(t *html.Tokenizer) string {
+		for tt := html.NewTokenizer(strings.NewReader(dscr.Html.Markup)); ; {
-			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 {
 			t := tt.Next()
 			switch t {
 			case html.ErrorToken:
 	}
 	// вперёд-назад
-	if c.More {
+	if p != 417 || c.More {
 		prevrev("| Next =>", p+1, false)
 	}

app/wrapper.go +53 −11

	@@ -10,6 +10,7 @@ import (
10	"time"	10	"time"
11		11
12	"git.macaw.me/skunky/devianter"	12	"git.macaw.me/skunky/devianter"
		13	"golang.org/x/net/html"
13	)	14	)
14		15
15	var wr = io.WriteString	16	var wr = io.WriteString
	@@ -131,13 +132,7 @@ func (s skunkyart) GRUser() {
131	case "group_admins":	132	case "group_admins":
132	var htm strings.Builder	133	var htm strings.Builder
133	for _, z := range x.ModuleData.GroupAdmins.Results {	134	for _, z := range x.ModuleData.GroupAdmins.Results {
134	htm.WriteString(`<div class="admin"><img src="`)	135	htm.WriteString(BuildUserPlate(z.User.Username))
135	htm.WriteString(UrlBuilder("media", "emojitar", z.User.Username, "?type=a"))
136	htm.WriteString(`"><a href="`)
137	htm.WriteString(UrlBuilder("group_user", "?type=about&q=", z.User.Username))
138	htm.WriteString(`">`)
139	htm.WriteString(z.User.Username)
140	htm.WriteString(`</a></div>`)
141	}	136	}
142	group.Admins += htm.String()	137	group.Admins += htm.String()
143	}	138	}
	@@ -270,15 +265,62 @@ func (s skunkyart) Search() {
270	ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type)	265	ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type)
271	case 'g':	266	case 'g':
272	ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type, s.Args.Get("usr"))	267	ss.Content, e = devianter.SearchFunc(s.Query, s.Page, s.Type, s.Args.Get("usr"))
		268	case 'r': // скраппер, поскольку девиантартовцы зажопили гостевое API для поиска групп
		269	var (
		270	usernames = make(map[int]string)
		271	url strings.Builder
		272	num int
		273	)
		274
		275	s.Page++
		276
		277	url.WriteString("https://www.deviantart.com/groups/?q=")
		278	url.WriteString(s.Query)
		279	if s.Page > 1 {
		280	url.WriteString("&offset=")
		281	url.WriteString(strconv.Itoa(10 * s.Page))
		282	}
		283
		284	r, err := http.Get(url.String())
		285	if err != nil {
		286	s.ReturnHTTPError(502)
		287	}
		288	defer r.Body.Close()
		289
		290	for z := html.NewTokenizer(r.Body); ; {
		291	if n, token := z.Next(), z.Token(); n == html.StartTagToken && token.Data == "a" {
		292	for _, x := range token.Attr {
		293	if x.Key == "class" && x.Val == "u regular username" {
		294	usernames[num] = tagval(z)
		295	num++
		296	}
		297	}
		298	} else if n == 0 {
		299	break
		300	} else {
		301	continue
		302	}
		303	}
		304
		305	if l := len(usernames); l != 0 {
		306	ss.List += `<div class="content plates">`
		307	for x := 0; x < len(usernames); x++ {
		308	ss.List += BuildUserPlate(usernames[x])
		309	}
		310	ss.List += `</div>`
		311	ss.List += s.NavBase(dlist{})
		312	}
273	default:	313	default:
274	s.ReturnHTTPError(400)	314	s.ReturnHTTPError(400)
275	}	315	}
276	err(e)	316	err(e)
277		317
278	ss.List = s.DeviationList(ss.Content.Results, dlist{	318	if s.Type != 'r' {
279	Pages: ss.Content.Pages,	319	ss.List = s.DeviationList(ss.Content.Results, dlist{
280	More: ss.Content.HasMore,	320	Pages: ss.Content.Pages,
281	})	321	More: ss.Content.HasMore,
		322	})
		323	}
282		324
283	s.ExecuteTemplate("html/search.htm", &s)	325	s.ExecuteTemplate("html/search.htm", &s)
284	}	326	}

css/skunky.css +9 −5

     border: 3px solid #4d27d6;
     transition: 400ms;
 }
-.block img, .admins .admin img{
+.block img, .plates .user-plate img{
     width: 100%;
 }
 .block p {
     background-color: #060820;
     border: 3px solid #060820;
 }
-.admins {
+.plates {
     display: flex
 }
-.admins .admin {
+.admins .user-plate {
-    margin-left: 1%;
+    width: 5%;
     background-color: #011522;
+}
+.plates .user-plate {
+    margin-left: 1%;
+    background-color: #091f19;
     padding: 3px;
     word-break: break-all;
     text-align: center;
-    width: 5%;
+    max-width: 15%;
 }
 @media screen and (orientation: portrait) {

html/about.htm +1

	@@ -12,6 +12,7 @@
12	<select name="type">	12	<select name="type">
13	<option value="all">All</option>	13	<option value="all">All</option>
14	<option value="tag">Tag</option>	14	<option value="tag">Tag</option>
		15	<option value="r">Groups</option>
15	</select>	16	</select>
16	<button type="submit">Search!</button>	17	<button type="submit">Search!</button>
17	</form>	18	</form>

html/deviantion.htm +1

	@@ -12,6 +12,7 @@
12	<select name="type">	12	<select name="type">
13	<option value="all">All</option>	13	<option value="all">All</option>
14	<option value="tag">Tag</option>	14	<option value="tag">Tag</option>
		15	<option value="r">Groups</option>
15	</select>	16	</select>
16	<button type="submit">Search!</button>	17	<button type="submit">Search!</button>
17	</form>	18	</form>

html/gruser.htm +2 −1

                     <option value="gallery">Gallery</option>
                     <option value="all">All</option>
                     <option value="tag">Tag</option>
+                    <option value="r">Groups</option>
                 </select>
                 <button type="submit">Search!</button>
             </form> <h1>| {{.Templates.GroupUser.GR.Owner.Username}}</h1>
             {{if ne .Templates.GroupUser.Admins ""}}
             <h3 id="admins"><a href="#admins">#</a> Group admins</h3>
-            <div class="admins">
+            <div class="plates admins">
             {{.Templates.GroupUser.Admins}}
             </div>
             {{end}}

html/index.htm +1

	@@ -11,6 +11,7 @@
11	<select name="type">	11	<select name="type">
12	<option value="all">All</option>	12	<option value="all">All</option>
13	<option value="tag">Tag</option>	13	<option value="tag">Tag</option>
		14	<option value="r">Groups</option>
14	</select>	15	</select>
15	<button type="submit">Search!</button>	16	<button type="submit">Search!</button>
16	</form>	17	</form>

html/list.htm +1

	@@ -12,6 +12,7 @@
12	<select name="type">	12	<select name="type">
13	<option value="all">All</option>	13	<option value="all">All</option>
14	<option value="tag">Tag</option>	14	<option value="tag">Tag</option>
		15	<option value="r">Groups</option>
15	</select>	16	</select>
16	<button type="submit">Search!</button>	17	<button type="submit">Search!</button>
17	</form>	18	</form>

html/search.htm +1

	@@ -12,6 +12,7 @@
12	<select name="type">	12	<select name="type">
13	<option value="all">All</option>	13	<option value="all">All</option>
14	<option value="tag">Tag</option>	14	<option value="tag">Tag</option>
		15	<option value="r">Groups</option>
15	</select>	16	</select>
16	<button type="submit">Search!</button>	17	<button type="submit">Search!</button>
17	</form>	18	</form>

Commit 0f528ee9fa

Commit `0f528ee9fa`