mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-12-25 19:52:11 +00:00
[chore] Stub /api/v1/announcements implementation (#3630)
* [chore] Stub /api/v1/announcements implementation This implements the /api/v1/announcements endpoint by simply returning an empty array. This indicates there are no instance announcements. Some clients retrieve this endpoint and get surprised by a 404. It tends to be harmless, but results in some unnecessary logging when trying to debug other things. * [fix] Forgot some swagger * [fix] Fix swagger some more
This commit is contained in:
parent
9ae0c7b363
commit
1aa7f70660
|
@ -6745,6 +6745,34 @@ paths:
|
||||||
summary: View instance rule with the given id.
|
summary: View instance rule with the given id.
|
||||||
tags:
|
tags:
|
||||||
- admin
|
- admin
|
||||||
|
/api/v1/announcements:
|
||||||
|
get:
|
||||||
|
description: 'THIS ENDPOINT IS CURRENTLY NOT FULLY IMPLEMENTED: it will always return an empty array.'
|
||||||
|
operationId: announcementsGet
|
||||||
|
produces:
|
||||||
|
- application/json
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: ""
|
||||||
|
schema:
|
||||||
|
items:
|
||||||
|
type: object
|
||||||
|
maxItems: 0
|
||||||
|
type: array
|
||||||
|
"400":
|
||||||
|
description: bad request
|
||||||
|
"401":
|
||||||
|
description: unauthorized
|
||||||
|
"406":
|
||||||
|
description: not acceptable
|
||||||
|
"500":
|
||||||
|
description: internal server error
|
||||||
|
security:
|
||||||
|
- OAuth2 Bearer:
|
||||||
|
- read:announcements
|
||||||
|
summary: Get an array of currently active announcements.
|
||||||
|
tags:
|
||||||
|
- announcements
|
||||||
/api/v1/apps:
|
/api/v1/apps:
|
||||||
post:
|
post:
|
||||||
consumes:
|
consumes:
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/api/client/accounts"
|
"github.com/superseriousbusiness/gotosocial/internal/api/client/accounts"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/api/client/admin"
|
"github.com/superseriousbusiness/gotosocial/internal/api/client/admin"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/api/client/announcements"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/api/client/apps"
|
"github.com/superseriousbusiness/gotosocial/internal/api/client/apps"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/api/client/blocks"
|
"github.com/superseriousbusiness/gotosocial/internal/api/client/blocks"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/api/client/bookmarks"
|
"github.com/superseriousbusiness/gotosocial/internal/api/client/bookmarks"
|
||||||
|
@ -66,6 +67,7 @@ type Client struct {
|
||||||
|
|
||||||
accounts *accounts.Module // api/v1/accounts, api/v1/profile
|
accounts *accounts.Module // api/v1/accounts, api/v1/profile
|
||||||
admin *admin.Module // api/v1/admin
|
admin *admin.Module // api/v1/admin
|
||||||
|
announcements *announcements.Module // api/v1/announcements
|
||||||
apps *apps.Module // api/v1/apps
|
apps *apps.Module // api/v1/apps
|
||||||
blocks *blocks.Module // api/v1/blocks
|
blocks *blocks.Module // api/v1/blocks
|
||||||
bookmarks *bookmarks.Module // api/v1/bookmarks
|
bookmarks *bookmarks.Module // api/v1/bookmarks
|
||||||
|
@ -117,6 +119,7 @@ func (c *Client) Route(r *router.Router, m ...gin.HandlerFunc) {
|
||||||
h := apiGroup.Handle
|
h := apiGroup.Handle
|
||||||
c.accounts.Route(h)
|
c.accounts.Route(h)
|
||||||
c.admin.Route(h)
|
c.admin.Route(h)
|
||||||
|
c.announcements.Route(h)
|
||||||
c.apps.Route(h)
|
c.apps.Route(h)
|
||||||
c.blocks.Route(h)
|
c.blocks.Route(h)
|
||||||
c.bookmarks.Route(h)
|
c.bookmarks.Route(h)
|
||||||
|
@ -156,6 +159,7 @@ func NewClient(state *state.State, p *processing.Processor) *Client {
|
||||||
|
|
||||||
accounts: accounts.New(p),
|
accounts: accounts.New(p),
|
||||||
admin: admin.New(state, p),
|
admin: admin.New(state, p),
|
||||||
|
announcements: announcements.New(p),
|
||||||
apps: apps.New(p),
|
apps: apps.New(p),
|
||||||
blocks: blocks.New(p),
|
blocks: blocks.New(p),
|
||||||
bookmarks: bookmarks.New(p),
|
bookmarks: bookmarks.New(p),
|
||||||
|
|
42
internal/api/client/announcements/announcements.go
Normal file
42
internal/api/client/announcements/announcements.go
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
// GoToSocial
|
||||||
|
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
||||||
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
//
|
||||||
|
// 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 announcements
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/processing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// BasePath is the base path for this api module, excluding the api prefix
|
||||||
|
const BasePath = "/v1/announcements"
|
||||||
|
|
||||||
|
type Module struct {
|
||||||
|
processor *processing.Processor
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(processor *processing.Processor) *Module {
|
||||||
|
return &Module{
|
||||||
|
processor: processor,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Module) Route(attachHandler func(method string, path string, f ...gin.HandlerFunc) gin.IRoutes) {
|
||||||
|
attachHandler(http.MethodGet, BasePath, m.AnnouncementsGETHandler)
|
||||||
|
}
|
74
internal/api/client/announcements/announcementsget.go
Normal file
74
internal/api/client/announcements/announcementsget.go
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
// GoToSocial
|
||||||
|
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
||||||
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
//
|
||||||
|
// 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 announcements
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/oauth"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AnnouncementsGETHandler swagger:operation GET /api/v1/announcements announcementsGet
|
||||||
|
//
|
||||||
|
// Get an array of currently active announcements.
|
||||||
|
//
|
||||||
|
// THIS ENDPOINT IS CURRENTLY NOT FULLY IMPLEMENTED: it will always return an empty array.
|
||||||
|
//
|
||||||
|
// ---
|
||||||
|
// tags:
|
||||||
|
// - announcements
|
||||||
|
//
|
||||||
|
// produces:
|
||||||
|
// - application/json
|
||||||
|
//
|
||||||
|
// security:
|
||||||
|
// - OAuth2 Bearer:
|
||||||
|
// - read:announcements
|
||||||
|
//
|
||||||
|
// responses:
|
||||||
|
// '200':
|
||||||
|
// schema:
|
||||||
|
// type: array
|
||||||
|
// items:
|
||||||
|
// type: object
|
||||||
|
// maxItems: 0
|
||||||
|
// '400':
|
||||||
|
// description: bad request
|
||||||
|
// '401':
|
||||||
|
// description: unauthorized
|
||||||
|
// '406':
|
||||||
|
// description: not acceptable
|
||||||
|
// '500':
|
||||||
|
// description: internal server error
|
||||||
|
func (m *Module) AnnouncementsGETHandler(c *gin.Context) {
|
||||||
|
_, err := oauth.Authed(c, true, true, true, true)
|
||||||
|
if err != nil {
|
||||||
|
apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := apiutil.NegotiateAccept(c, apiutil.JSONAcceptHeaders...); err != nil {
|
||||||
|
apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
apiutil.JSON(c, http.StatusOK, apiutil.EmptyJSONArray)
|
||||||
|
}
|
Loading…
Reference in a new issue