deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mediaproxy: remove deprecated custom ResponseError struct

Browse source
This commit is contained in:
Tulir Asokan 2025-05-28 21:39:34 +03:00
commit f73480446c
1 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
mediaproxy/mediaproxy.go
View file

@ -8,7 +8,6 @@ package mediaproxy
import (
"context"
"encoding/json"
"errors"
"fmt"
"io"
@ -223,16 +222,6 @@ func (mp *MediaProxy) RegisterRoutes(router *mux.Router) {
mp.KeyServer.Register(router)
}
// Deprecated: use mautrix.RespError instead
type ResponseError struct {
Status int
Data any
}
func (err *ResponseError) Error() string {
return fmt.Sprintf("HTTP %d: %v", err.Status, err.Data)
}
var ErrInvalidMediaIDSyntax = errors.New("invalid media ID syntax")
func queryToMap(vals url.Values) map[string]string {
@ -247,17 +236,11 @@ func (mp *MediaProxy) getMedia(w http.ResponseWriter, r *http.Request) GetMediaR
mediaID := mux.Vars(r)["mediaID"]
resp, err := mp.GetMedia(r.Context(), mediaID, queryToMap(r.URL.Query()))
if err != nil {
//lint:ignore SA1019 deprecated types need to be supported until they're removed
var respError *ResponseError
var mautrixRespError mautrix.RespError
if errors.Is(err, ErrInvalidMediaIDSyntax) {
mautrix.MNotFound.WithMessage("This is a media proxy at %q, other media downloads are not available here", mp.serverName).Write(w)
} else if errors.As(err, &mautrixRespError) {
mautrixRespError.Write(w)
} else if errors.As(err, &respError) {
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(respError.Status)
_ = json.NewEncoder(w).Encode(respError.Data)
} else {
zerolog.Ctx(r.Context()).Err(err).Str("media_id", mediaID).Msg("Failed to get media URL")
mautrix.MNotFound.WithMessage("Media not found").Write(w)