diff options
Diffstat (limited to 'internal/transport/derefmedia.go')
| -rw-r--r-- | internal/transport/derefmedia.go | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/internal/transport/derefmedia.go b/internal/transport/derefmedia.go index 5fa901100..e265bfdd4 100644 --- a/internal/transport/derefmedia.go +++ b/internal/transport/derefmedia.go @@ -1,3 +1,21 @@ +/* + GoToSocial + Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + package transport import ( @@ -8,14 +26,13 @@ import ( "net/url" ) -func (t *transport) DereferenceMedia(c context.Context, iri *url.URL, expectedContentType string) ([]byte, error) { +func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL, expectedContentType string) ([]byte, error) { l := t.log.WithField("func", "DereferenceMedia") l.Debugf("performing GET to %s", iri.String()) - req, err := http.NewRequest("GET", iri.String(), nil) + req, err := http.NewRequestWithContext(ctx, "GET", iri.String(), nil) if err != nil { return nil, err } - req = req.WithContext(c) if expectedContentType == "" { req.Header.Add("Accept", "*/*") } else { |