Commit `cec788554a`

cec788554afe20b8c67357ede087b3c5c543be89

parent: 8f645d7ccb

Unsigned

lost+skunk <skunky@macaw.me> · 2024-06-14 17:05 UTC

Daily Deviations

Layout: unified · split

comments.go +1 −1

	@@ -15,7 +15,7 @@ type Comments struct {
15	Thread []struct {	15	Thread []struct {
16	Replies, Likes int	16	Replies, Likes int
17	ID int `json:"commentId"`	17	ID int `json:"commentId"`
18	Parent int `json:"ParrentId"`	18	Parent int `json:"parentId"`
19		19
20	Posted time	20	Posted time
21	Author bool `json:"isAuthorHighlited"`	21	Author bool `json:"isAuthorHighlited"`

deviantion.go +4 −2

 				url.WriteString("image")
 				url.WriteString(".gif")
 			}
-			url.WriteString("?token=")
+			if len(m.Token) > 0 {
-			url.WriteString(m.Token[0])
+				url.WriteString("?token=")
+				url.WriteString(m.Token[0])
+			}
 		}
 	}
 	return url.String()

misc.go +36 −28

 	return "", errors.New("User not exists")
 }
+/* DAILY DEVIATIONS */
+type DailyDeviations struct {
+	HasMore bool
+	Strips  []struct {
+		Codename, Title string
+		TitleType       string
+		Deviations      []Deviation
+	}
+	Deviations []Deviation
+}
+func DailyDeviationsFunc(page int) (dd DailyDeviations) {
+	ujson("dabrowse/networkbar/rfy/deviations?page="+strconv.Itoa(page), &dd)
+	return
+}
 /* SEARCH */
 type Search struct {
-	Total   int         `json:"estTotal"`
+	Total   int `json:"estTotal"`
-	Pages   int         // only for 'a' and 'g' scope.
+	Pages   int // only for 'a' and 'g' scope.
+	HasMore bool
 	Results []Deviation `json:"deviations,results"`
 }
 }
 /* PUPPY aka DeviantArt API */
-func puppy(data string) (string, error) {
+// получение или обновление токена
-	// получение или обновление токена
+var cookie string
-	update := func() (string, string, error) {
+var token string
-		var cookie string
-		if cookie == "" {
-			req := request("https://www.deviantart.com/_puppy")
-			for _, content := range req.Cookies {
-				cookie = content.Raw
-			}
-		}
-		req := request("https://www.deviantart.com", cookie)
+func UpdateCSRF() error {
-		if req.Status != 200 {
+	if cookie == "" {
-			return "", "", errors.New(req.Body)
+		req := request("https://www.deviantart.com/_puppy")
-		}
-		return cookie, req.Body[strings.Index(req.Body, "window.__CSRF_TOKEN__ = '")+25 : strings.Index(req.Body, "window.__XHR_LOCAL__")-3], nil
+		for _, content := range req.Cookies {
+			cookie = content.Raw
+		}
 	}
-	// использование токена
+	req := request("https://www.deviantart.com", cookie)
-	var (
+	if req.Status != 200 {
-		cookie, token string
+		return errors.New(req.Body)
-	)
-	if cookie == "" || token == "" {
-		var e error
-		cookie, token, e = update()
-		if e != nil {
-			return "", e
-		}
 	}
+	token = req.Body[strings.Index(req.Body, "window.__CSRF_TOKEN__ = '")+25 : strings.Index(req.Body, "window.__XHR_LOCAL__")-3]
+	return nil
+}
+func puppy(data string) (string, error) {
 	var url strings.Builder
 	url.WriteString("https://www.deviantart.com/_puppy/")
 	url.WriteString(data)

Commit cec788554a

Commit `cec788554a`