Commit `efa4b86a67`

efa4b86a67d67ce9ff1ff19391dbf73f13daece6

parent: cec788554a

Unsigned

lost+skunk <skunky@ebloid.ru> · 2024-06-27 11:52 UTC

крымские наработки

Layout: unified · split

.vscode/launch.json added +16

@@ -0,0 +1,16 @@
	1	{
	2	// Use IntelliSense to learn about possible attributes.
	3	// Hover to view descriptions of existing attributes.
	4	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
	5	"version": "0.2.0",
	6	"configurations": [
	7	{
	8	"name": "Launch Package",
	9	"type": "go",
	10	"request": "launch",
	11	"mode": "debug",
	12	"program": "${fileDirname}",
	13	"showLog": true
	14	}
	15	]
	16	}\ No newline at end of file

comments.go +1 −1

	@@ -23,7 +23,7 @@ type Comments struct {
23	Desctiption string	23	Desctiption string
24	Comment string	24	Comment string
25		25
26	TextContent text	26	TextContent Text
27		27
28	User struct {	28	User struct {
29	Username string	29	Username string

deviantion.go +6 −6

	@@ -35,21 +35,21 @@ type Deviation struct {
35	Stats struct {	35	Stats struct {
36	Favourites, Views, Downloads int	36	Favourites, Views, Downloads int
37	}	37	}
38	Media media	38	Media Media
39	Extended struct {	39	Extended struct {
40	Tags []struct {	40	Tags []struct {
41	Name string	41	Name string
42	}	42	}
43	DescriptionText text	43	DescriptionText Text
44	RelatedContent []struct {	44	RelatedContent []struct {
45	Deviations []Deviation	45	Deviations []Deviation
46	}	46	}
47	}	47	}
48	TextContent text	48	TextContent Text
49	}	49	}
50		50
51	// её выпердыши	51	// её выпердыши
52	type media struct {	52	type Media struct {
53	BaseUri string	53	BaseUri string
54	Token []string	54	Token []string
55	Types []struct {	55	Types []struct {
	@@ -58,7 +58,7 @@ type media struct {
58	}	58	}
59	}	59	}
60		60
61	type text struct {	61	type Text struct {
62	Excerpt string	62	Excerpt string
63	Html struct {	63	Html struct {
64	Markup, Type string	64	Markup, Type string
	@@ -83,7 +83,7 @@ type Post struct {
83	}	83	}
84		84
85	// преобразование урла в правильный	85	// преобразование урла в правильный
86	func UrlFromMedia(m media) string {	86	func UrlFromMedia(m Media) string {
87	var url strings.Builder	87	var url strings.Builder
88	for _, t := range m.Types {	88	for _, t := range m.Types {
89	if t.T == "fullview" {	89	if t.T == "fullview" {

misc.go +8 −10

 	req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0.0")
 	// куки и UA-шник
-	if other != nil {
+	for num, rng := range other {
-		for num, rng := range other {
+		switch num {
-			switch num {
+		case 1:
-			case 1:
+			req.Header.Set("User-Agent", rng)
-				req.Header.Set("User-Agent", rng)
+		case 0:
-			case 0:
+			req.Header.Set("Cookie", rng)
-				req.Header.Set("Cookie", rng)
-			}
 		}
 	}
 		}
 	}
-	return "", errors.New("User not exists")
+	return "", errors.New("user not exists")
 }
 /* DAILY DEVIATIONS */
 			}
 			url.WriteString("&type=gallery&order=most-recent&init=true&limit=50&q=")
 		} else {
-			e = errors.New("Missing username (last argument)")
+			e = errors.New("missing username (last argument)")
 			return
 		}
 	default:

user-group.go +44 −36

 )
 // структура группы или пользователя
+type groups struct {
+	GroupAbout struct {
+		FoundatedAt time `json:"foundationTs"`
+		Description Text
+	}
+	GroupAdmins struct {
+		Results []struct {
+			Username string
+		}
+	}
+}
+type About struct {
+	Country, Website, WebsiteLabel, Gender string
+	RegDate                                int64 `json:"deviantFor"`
+	Description                            Text  `json:"textContent"`
+	SocialLinks []struct {
+		Value string
+	}
+	Interests []struct {
+		Label, Value string
+	}
+}
+type users struct {
+	About          About
+	CoverDeviation struct {
+		Deviation Deviation `json:"coverDeviation"`
+	}
+}
 type GRuser struct {
 	ErrorDescription string
 	Owner            struct {
 			Modules []struct {
 				Name       string
 				ModuleData struct {
-					About struct {
+					groups
-						Country, Website, WebsiteLabel, Gender, Tagline string
+					users
-						DeviantFor                                      int64
-						SocialLinks                                     []struct {
-							Value string
-						}
-						TextContent text
-						Interests   []struct {
-							Label, Value string
-						}
-					}
-					CoverDeviation struct {
-						Deviation Deviation `json:"coverDeviation"`
-					}
 					// группы
-					GroupAbout struct {
-						Tagline     string
-						CreatinDate time `json:"foundationTs"`
-						Description text
-					}
-					GroupAdmins struct {
-						Results []struct {
-							Username string
-						}
-					}
 					Folders struct {
 						Results []struct {
 							FolderId int
 					}
 					// галерея
-					ModuleData struct {
+					Folder struct {
-						Folder struct {
+						Username   string
-							Username   string
+						Pages      int `json:"totalPageCount"`
-							Pages      int `json:"totalPageCount"`
+						Deviations []Deviation
-							Deviations []Deviation
+					} `json:"folderDeviations"`
-						} `json:"folderDeviations"`
-					}
 				}
 			}
 		}
 	}
-	PageExtraData struct {
+	Extra struct {
-		GruserTagline string
+		Tag   string `json:"gruserTagline"`
-		Stats         struct {
+		Stats struct {
 			Deviations, Watchers, Watching, Pageviews, CommentsMade, Favourites, Friends int
 			FeedComments                                                                 int `json:"commentsReceivedProfile"`
 		}
-	}
+	} `json:"pageExtraData"`
 }
 type Group struct {
 }
 // подходит как группа, так и пользователь
-func (s Group) GroupFunc() (g Group) {
+func (s Group) GroupFunc() (g GRuser) {
 	ujson("dauserprofile/init/about?username="+s.Name, &g)
 	return

Commit efa4b86a67

Commit `efa4b86a67`