9b85088665 · krz/devianter

comments.go +9 −12

 	Total  int
 	Thread []struct {
-		CommentId, ParentId, Replies, Likes int
+		Replies, Likes int
-		Posted                              time
+		ID             int `json:"commentId"`
-		IsAuthorHighlited                   bool
+		Parent         int `json:"ParrentId"`
-		Desctiption string
+		Posted time
+		Author bool `json:"isAuthorHighlited"`
-		// упрощение структуры с комментами
+		Desctiption string
-		Comment string
+		Comment     string
-		TextContent struct {
+		TextContent text
-			Html struct {
-				Markup string
-			}
-		}
 		User struct {
 			Username string
-			IsBanned bool
+			Banned   bool `json:"isBanned"`
 		}
 	}
 }

deviantion.go +12 −7

	@@ -21,10 +21,14 @@ func (t *time) UnmarshalJSON(b []byte) (err error) {
21		21
22	// самая главная структура для поста	22	// самая главная структура для поста
23	type deviantion struct {	23	type deviantion struct {
24	Title, Url, License string	24	Title, Url, License string
25	PublishedTime time	25	PublishedTime time
26	IsMature, IsAiGenerated, IsDailyDeviation bool	26
27	Author struct {	27	NSFW bool `json:"isMature"`
		28	AI bool `json:"isAiGenerated"`
		29	DD bool `json:"isDailyDeviation"`
		30
		31	Author struct {
28	Username string	32	Username string
29	}	33	}
30	Stats struct {	34	Stats struct {
	@@ -54,11 +58,13 @@ type media struct {
54	}	58	}
55		59
56	type text struct {	60	type text struct {
57	Html struct {	61	Excerpt string
		62	Html struct {
58	Markup, Type string	63	Markup, Type string
59	}	64	}
60	}	65	}
61		66
		67	// структура поста
62	type Deviantion struct {	68	type Deviantion struct {
63	Deviation deviantion	69	Deviation deviantion
64	Comments struct {	70	Comments struct {
	@@ -73,7 +79,6 @@ type Deviantion struct {
73	}	79	}
74		80
75	IMG, Desctiption string	81	IMG, Desctiption string
76	Recomendations []deviantion
77	}	82	}
78		83
79	// для работы функции нужно ID поста и имя пользователя.	84	// для работы функции нужно ID поста и имя пользователя.
	@@ -98,7 +103,7 @@ func Deviation(id string, user string) Deviantion {
98		103
99	// базовая обработка описания	104	// базовая обработка описания
100	txt := st.Deviation.TextContent.Html.Markup	105	txt := st.Deviation.TextContent.Html.Markup
101	if len(txt) > 0 && txt[0:1] == "{" {	106	if len(txt) > 0 && txt[1] == 125 {
102	var description struct {	107	var description struct {
103	Blocks []struct {	108	Blocks []struct {
104	Text string	109	Text string

examples/post.go deleted −25

	@@ -1,25 +0,0 @@
1	package main
2
3	import (
4	"git.macaw.me/skunky/devianter"
5	)
6
7	func main() {
8	id := "973578309"
9	d := devianter.Deviation(id, "Thrumyeye")
10
11	println("Post Name:", d.Deviation.Title, "\nIMG url:", d.IMG)
12
13	c := devianter.Comments(id, "", 0, 1)
14	println("\n\nPost Comments:", c.Total)
15
16	for _, a := range c.Thread {
17	if a.User.IsBanned {
18	a.User.Username += " [v bane]"
19	}
20	println(a.User.Username+":", a.Comment)
21	}
22
23	search := devianter.Search("skunk", "2", 'a')
24	println(search.Total, search.Pages)
25	}

implementation.md +2

	@@ -2,3 +2,5 @@
2	- emojis	2	- emojis
3	- deviantions	3	- deviantions
4	- comments	4	- comments
		5	- search (including gallery search)
		6	- users (with gallery)

misc.go +35 −14

 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"log"
 	"math"
 	"net/http"
+	"strconv"
 	"strings"
 )
 /* SEARCH */
 type search struct {
-	Total      int `json:"estTotal"`
+	Total   int          `json:"estTotal"`
-	Pages      int // only for 'a' scope.
+	Pages   int          // only for 'a' and 'g' scope.
-	Deviations []deviantion
+	Results []deviantion `json:"deviations,results"`
 }
-func Search(query, page string, scope rune) (ss search) {
+func Search(query string, page int, scope rune, user ...string) (ss search, e error) {
 	var url strings.Builder
+	e = nil
 	// о5 построение ссылок.
 	switch scope {
-	case 'a':
+	case 'a': // поиск артов по названию
 		url.WriteString("dabrowse/search/all?q=")
-	case 't':
+	case 't': // поиск артов по тегам
 		url.WriteString("dabrowse/networkbar/tag/deviations?tag=")
+	case 'g': // поиск артов пользователя или группы
+		if user != nil {
+			url.WriteString("dashared/gallection/search?username=")
+			for _, a := range user {
+				url.WriteString(a)
+			}
+			url.WriteString("&type=gallery&order=most-recent&init=true&limit=50&q=")
+		} else {
+			e = errors.New("Missing username (last argument)")
+			return
+		}
 	default:
-		log.Fatalln("Invalid type.\n- 'a' -- all;\n- 't' -- tag.")
+		log.Fatalln("Invalid type.\n- 'a' -- all;\n- 't' -- tag;\n- 'g' - gallery.")
 	}
 	url.WriteString(query)
-	url.WriteString("&page=")
+	if scope != 'g' { // если область поиска не равна поиску по группам, то активируется этот код
-	url.WriteString(page)
+		url.WriteString("&page=")
+	} else { // иначе вместо страницы будет оффсет и страница умножится на 50
+		url.WriteString("&offset=")
+		page = 50 * page
+	}
+	url.WriteString(strconv.Itoa(page))
 	ujson(url.String(), &ss)
 		}
 	}
-	body := request(
+	var url strings.Builder
-		fmt.Sprintf("https://www.deviantart.com/_puppy/%s&csrf_token=%s&da_minor_version=20230710", data, token),
+	url.WriteString("https://www.deviantart.com/_puppy/")
-		cookie,
+	url.WriteString(data)
-	)
+	url.WriteString("&csrf_token=")
+	url.WriteString(token)
+	url.WriteString("&da_minor_version=20230710")
+	body := request(url.String(), cookie)
 	// если код ответа не 200, возвращается ошибка
 	if body.Status != 200 {

todo.md +2 −3

	@@ -1,3 +1,2 @@
1	- ~~users~~	1	- groups
2	- ~~groups~~	2	- images in comments\ No newline at end of file
3	- ~~images in comments~~\ No newline at end of file

user-group.go added +92

@@ -0,0 +1,92 @@
	1	package devianter
	2
	3	import (
	4	"strconv"
	5	"strings"
	6	)
	7
	8	// структура группы или пользователя
	9	type Group struct {
	10	ErrorDescription string
	11	Owner struct {
	12	Group bool `json:"isGroup"`
	13	Username string
	14	}
	15	Gruser struct {
	16	ID int `json:"gruserId"`
	17	Page struct {
	18	Modules []struct {
	19	Name string
	20	ModuleData struct {
	21	About struct {
	22	Country, Website, WebsiteLabel, Gender, Tagline string
	23	DeviantFor int64
	24	SocialLinks []struct {
	25	Value string
	26	}
	27	TextContent text
	28	Interests []struct {
	29	Label, Value string
	30	}
	31	}
	32	CoverDeviation struct {
	33	Deviation deviantion `json:"coverDeviation"`
	34	}
	35
	36	// группы
	37	GroupAbout struct {
	38	Tagline string
	39	CreatinDate time `json:"foundationTs"`
	40	Description text
	41	}
	42	GroupAdmins struct {
	43	Results []struct {
	44	Username string
	45	}
	46	}
	47	Folders struct {
	48	Results []struct {
	49	FolderId int
	50	Name string
	51	}
	52	}
	53
	54	// галерея
	55	ModuleData struct {
	56	Folder struct {
	57	Username string
	58	Pages int `json:"totalPageCount"`
	59	Deviations []deviantion
	60	} `json:"folderDeviations"`
	61	}
	62	}
	63	}
	64	}
	65	}
	66	PageExtraData struct {
	67	GruserTagline string
	68	Stats struct {
	69	Deviations, Watchers, Watching, Pageviews, CommentsMade, Favourites, Friends int
	70	FeedComments int `json:"commentsReceivedProfile"`
	71	}
	72	}
	73	}
	74
	75	func UGroup(name string) (g Group) {
	76	ujson("dauserprofile/init/about?username="+name, &g)
	77
	78	return
	79	}
	80
	81	// гарелея пользователя или группы
	82	func Gallery(name string, page int) (g Group) {
	83	var url strings.Builder
	84	url.WriteString("dauserprofile/init/gallery?username=")
	85	url.WriteString(name)
	86	url.WriteString("&page=")
	87	url.WriteString(strconv.Itoa(page))
	88	url.WriteString("&deviations_limit=50&with_subfolders=false")
	89
	90	ujson(url.String(), &g)
	91	return
	92	}

Commit 9b85088665

Commit `9b85088665`