mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-31 05:52:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use httpclient.Client instead of standard net/http

Browse source
This commit is contained in:
kaimanhub 2025-04-08 19:54:18 +03:00
commit c42c391094
12 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/processing/status/preview_card.go
View file

@ -18,6 +18,7 @@
package status
import (
"context"
"fmt"
"net/http"
"net/url"
@ -27,6 +28,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/httpclient"
)
var urlRegex = regexp.MustCompile(`https?://[a-zA-Z0-9./?=_-]+`)
@ -40,7 +42,7 @@ func extractLastURL(text string) string {
}
// FetchPreview retrieves OpenGraph metadata from a URL.
func FetchPreview(text string) (*gtsmodel.Card, gtserror.WithCode) {
func FetchPreview(ctx context.Context, httpClient *httpclient.Client, text string) (*gtsmodel.Card, gtserror.WithCode) {
link := extractLastURL(text)
if link == "" {
return nil, nil
@ -55,7 +57,12 @@ func FetchPreview(text string) (*gtsmodel.Card, gtserror.WithCode) {
return nil, gtserror.NewErrorInternalError(fmt.Errorf("unsupported scheme: %s", parsed.Scheme))
}
resp, err := safeGet(parsed)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, link, nil)
if err != nil {
return nil, gtserror.NewErrorInternalError(err, "failed to create request")
}
resp, err := httpClient.Do(req)
if err != nil {
return nil, gtserror.NewErrorInternalError(err, "request failed")
}
@ -109,8 +116,3 @@ func FetchPreview(text string) (*gtsmodel.Card, gtserror.WithCode) {
return card, nil
}
func safeGet(u *url.URL) (*http.Response, error) {
// #nosec G107 -- URL was already validated
return http.Get(u.String())
}