feat(Coomer): Add support for non-mandatory cookies

Author: vegidio

cmd/cli/umd.go

@@ -36,10 +36,10 @@ func startQuery(
 	u := umd.New()
 
 	if len(cookies) > 0 {
+		cookieHeader := fetch.CookiesToHeader(cookies)
 		metadata := umd.Metadata{
-			umd.SimpCity: map[string]any{
-				"cookie": fetch.CookiesToHeader(cookies),
-			},
+			umd.Coomer:   map[string]any{"cookie": cookieHeader},
+			umd.SimpCity: map[string]any{"cookie": cookieHeader},
 		}
 
 		u = u.WithMetadata(metadata)

cmd/gui/binding.go

@@ -46,10 +46,10 @@ func (a *App) QueryMedia(
 	u := umd.New()
 
 	if len(cookies) > 0 {
+		cookieHeader := fetch.CookiesToHeader(cookies)
 		metadata := umd.Metadata{
-			umd.SimpCity: map[string]any{
-				"cookie": fetch.CookiesToHeader(cookies),
-			},
+			umd.Coomer:   map[string]any{"cookie": cookieHeader},
+			umd.SimpCity: map[string]any{"cookie": cookieHeader},
 		}
 
 		u = u.WithMetadata(metadata)

internal/extractors/coomer/api.go

@@ -2,6 +2,7 @@ package coomer
 
 import (
 	"fmt"
+	"maps"
 
 	"github.com/samber/lo"
 	"github.com/vegidio/go-sak/fetch"
@@ -12,10 +13,12 @@ var f = fetch.New(nil, 10)
 var baseUrl string
 var cssHeaders = map[string]string{"Accept": "text/css"}
 
-func getProfile(service string, user string) (*Profile, error) {
+func getProfile(service string, user string, headers map[string]string) (*Profile, error) {
+	maps.Copy(headers, cssHeaders)
+
 	var profile *Profile
 	url := fmt.Sprintf(baseUrl+"/api/v1/%s/user/%s/profile", service, user)
-	resp, err := f.GetResult(url, cssHeaders, &profile)
+	resp, err := f.GetResult(url, headers, &profile)
 
 	if err != nil {
 		return nil, err
@@ -26,16 +29,18 @@ func getProfile(service string, user string) (*Profile, error) {
 	return profile, nil
 }
 
-func getUser(profile Profile) <-chan types.Result[Response] {
+func getUser(profile Profile, headers map[string]string) <-chan types.Result[Response] {
 	out := make(chan types.Result[Response])
 
+	maps.Copy(headers, cssHeaders)
+
 	go func() {
 		defer close(out)
 
 		for offset := 0; offset <= profile.PostCount; offset += 50 {
 			var posts []Post
 			url := fmt.Sprintf(baseUrl+"/api/v1/%s/user/%s/posts?o=%d", profile.Service, profile.Id, offset)
-			resp, err := f.GetResult(url, cssHeaders, &posts)
+			resp, err := f.GetResult(url, headers, &posts)
 
 			if err != nil {
 				out <- types.Result[Response]{Err: err}
@@ -49,7 +54,7 @@ func getUser(profile Profile) <-chan types.Result[Response] {
 			}
 
 			for _, post := range posts {
-				result := <-getPost(profile, post.Id)
+				result := <-getPost(profile, post.Id, headers)
 				if result.Err != nil {
 					out <- types.Result[Response]{Err: result.Err}
 					continue
@@ -65,15 +70,17 @@ func getUser(profile Profile) <-chan types.Result[Response] {
 	return out
 }
 
-func getPost(profile Profile, postId string) <-chan types.Result[Response] {
+func getPost(profile Profile, postId string, headers map[string]string) <-chan types.Result[Response] {
 	out := make(chan types.Result[Response])
 
+	maps.Copy(headers, cssHeaders)
+
 	go func() {
 		defer close(out)
 
 		var response Response
 		url := fmt.Sprintf(baseUrl+"/api/v1/%s/user/%s/post/%s", profile.Service, profile.Id, postId)
-		resp, err := f.GetResult(url, cssHeaders, &response)
+		resp, err := f.GetResult(url, headers, &response)
 
 		if err != nil {
 			out <- types.Result[Response]{Err: err}
@@ -91,7 +98,7 @@ func getPost(profile Profile, postId string) <-chan types.Result[Response] {
 		})
 
 		if biggestRevision.Post.RevisionId > 0 && (len(response.Images)+len(response.Videos)) < len(biggestRevision.Post.Attachments) {
-			out <- getRevision(profile, postId, biggestRevision.Post.RevisionId)
+			out <- getRevision(profile, postId, biggestRevision.Post.RevisionId, headers)
 			return
 		}
 
@@ -101,10 +108,10 @@ func getPost(profile Profile, postId string) <-chan types.Result[Response] {
 	return out
 }
 
-func getRevision(profile Profile, postId string, revisionId int) types.Result[Response] {
+func getRevision(profile Profile, postId string, revisionId int, headers map[string]string) types.Result[Response] {
 	var response ResponseRevision
 	url := fmt.Sprintf(baseUrl+"/api/v1/%s/user/%s/post/%s/revision/%d", profile.Service, profile.Id, postId, revisionId)
-	resp, err := f.GetResult(url, cssHeaders, &response)
+	resp, err := f.GetResult(url, headers, &response)
 
 	if err != nil {
 		return types.Result[Response]{Err: err}

internal/extractors/coomer/main.go

@@ -142,7 +142,14 @@ func (c *Coomer) QueryMedia(limit int, extensions []string, deep bool) (*types.R
 }
 
 func (c *Coomer) DownloadHeaders() map[string]string {
-	return nil
+	headers := make(map[string]string)
+
+	cookie, exists := c.Metadata[types.Coomer]["cookie"].(string)
+	if exists {
+		headers["Cookie"] = cookie
+	}
+
+	return headers
 }
 
 // Compile-time assertion to ensure the extractor implements the Extractor interface
@@ -157,9 +164,15 @@ func (c *Coomer) fetchMedia(
 ) <-chan saktypes.Result[types.Media] {
 	out := make(chan saktypes.Result[types.Media])
 
+	headers := make(map[string]string)
+	cookie, exists := c.Metadata[types.Coomer]["cookie"].(string)
+	if exists {
+		headers["Cookie"] = cookie
+	}
+
 	sourceValue := reflect.ValueOf(source)
 	serviceField := sourceValue.FieldByName("Service")
-	profile, pErr := getProfile(serviceField.String(), source.Name())
+	profile, pErr := getProfile(serviceField.String(), source.Name(), headers)
 
 	if pErr != nil {
 		out <- saktypes.Result[types.Media]{Err: pErr}
@@ -172,9 +185,9 @@ func (c *Coomer) fetchMedia(
 
 		switch s := source.(type) {
 		case SourceUser:
-			responses = getUser(*profile)
+			responses = getUser(*profile, headers)
 		case SourcePost:
-			responses = getPost(*profile, s.Id)
+			responses = getPost(*profile, s.Id, headers)
 		}
 
 		for response := range responses {