SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[bugfix] Make /api/v2/media more compatible with masto API (#724)

Browse Source 
* update docs

* make api version into a path param

* update tests

* workaround to unset URL if using v2 of api

* make some fields into pointers
This commit is contained in:
tobi
2022-07-22 12:48:19 +02:00
committed by GitHub
parent d20ec967c4
commit 73b8839c5d
8 changed files with 245 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
internal/api/client/media/media.go
View File

@@ -26,20 +26,12 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/router"
)
// BasePathV1 is the base API path for making media requests through v1 of the api (for mastodon API compatibility)
const BasePathV1 = "/api/v1/media"
// BasePathV2 is the base API path for making media requests through v2 of the api (for mastodon API compatibility)
const BasePathV2 = "/api/v2/media"
// IDKey is the key for media attachment IDs
const IDKey = "id"
// BasePathWithIDV1 corresponds to a media attachment with the given ID
const BasePathWithIDV1 = BasePathV1 + "/:" + IDKey
// BasePathWithIDV2 corresponds to a media attachment with the given ID
const BasePathWithIDV2 = BasePathV2 + "/:" + IDKey
const (
IDKey = "id" // IDKey is the key for media attachment IDs
APIVersionKey = "api_version" // APIVersionKey is the key for which version of the API to use (v1 or v2)
BasePathWithAPIVersion = "/api/:" + APIVersionKey + "/media" // BasePathWithAPIVersion is the base API path for making media requests through v1 or v2 of the api (for mastodon API compatibility)
BasePathWithIDV1 = "/api/v1/media/:" + IDKey // BasePathWithID corresponds to a media attachment with the given ID
)
// Module implements the ClientAPIModule interface for media
type Module struct {
@@ -55,15 +47,8 @@ func New(processor processing.Processor) api.ClientModule {
// Route satisfies the RESTAPIModule interface
func (m *Module) Route(s router.Router) error {
// v1 handlers
s.AttachHandler(http.MethodPost, BasePathV1, m.MediaCreatePOSTHandler)
s.AttachHandler(http.MethodPost, BasePathWithAPIVersion, m.MediaCreatePOSTHandler)
s.AttachHandler(http.MethodGet, BasePathWithIDV1, m.MediaGETHandler)
s.AttachHandler(http.MethodPut, BasePathWithIDV1, m.MediaPUTHandler)
// v2 handlers
s.AttachHandler(http.MethodPost, BasePathV2, m.MediaCreatePOSTHandler)
s.AttachHandler(http.MethodGet, BasePathWithIDV2, m.MediaGETHandler)
s.AttachHandler(http.MethodPut, BasePathWithIDV2, m.MediaPUTHandler)
return nil
}