diff options
Diffstat (limited to 'internal/api')
-rw-r--r-- | internal/api/client/emoji/emoji.go | 56 | ||||
-rw-r--r-- | internal/api/client/emoji/emojisget.go | 8 | ||||
-rw-r--r-- | internal/api/client/filter/filter.go | 56 | ||||
-rw-r--r-- | internal/api/client/filter/filtersget.go | 8 | ||||
-rw-r--r-- | internal/api/client/list/list.go | 56 | ||||
-rw-r--r-- | internal/api/client/list/listsgets.go | 8 | ||||
-rw-r--r-- | internal/api/client/notification/notification.go | 2 | ||||
-rw-r--r-- | internal/api/client/notification/notificationsget.go | 8 | ||||
-rw-r--r-- | internal/api/client/status/status.go | 4 | ||||
-rw-r--r-- | internal/api/client/status/statusboosted_by.go | 60 | ||||
-rw-r--r-- | internal/api/client/status/statuscontext.go | 60 | ||||
-rw-r--r-- | internal/api/client/timeline/home.go | 2 | ||||
-rw-r--r-- | internal/api/client/timeline/public.go | 92 | ||||
-rw-r--r-- | internal/api/client/timeline/timeline.go | 7 |
14 files changed, 423 insertions, 4 deletions
diff --git a/internal/api/client/emoji/emoji.go b/internal/api/client/emoji/emoji.go new file mode 100644 index 000000000..f30816176 --- /dev/null +++ b/internal/api/client/emoji/emoji.go @@ -0,0 +1,56 @@ +/* + 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 emoji + +import ( + "net/http" + + "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/api" + "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/processing" + "github.com/superseriousbusiness/gotosocial/internal/router" +) + +const ( + // BasePath is the base path for serving the emoji API + BasePath = "/api/v1/custom_emojis" +) + +// Module implements the ClientAPIModule interface for everything related to emoji +type Module struct { + config *config.Config + processor processing.Processor + log *logrus.Logger +} + +// New returns a new emoji module +func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.ClientModule { + return &Module{ + config: config, + processor: processor, + log: log, + } +} + +// Route attaches all routes from this module to the given router +func (m *Module) Route(r router.Router) error { + r.AttachHandler(http.MethodGet, BasePath, m.EmojisGETHandler) + return nil +} diff --git a/internal/api/client/emoji/emojisget.go b/internal/api/client/emoji/emojisget.go new file mode 100644 index 000000000..e4efb8825 --- /dev/null +++ b/internal/api/client/emoji/emojisget.go @@ -0,0 +1,8 @@ +package emoji + +import "github.com/gin-gonic/gin" + +// EmojisGETHandler returns a list of custom emojis enabled on the instance +func (m *Module) EmojisGETHandler(c *gin.Context) { + +} diff --git a/internal/api/client/filter/filter.go b/internal/api/client/filter/filter.go new file mode 100644 index 000000000..1a8421d26 --- /dev/null +++ b/internal/api/client/filter/filter.go @@ -0,0 +1,56 @@ +/* + 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 filter + +import ( + "net/http" + + "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/api" + "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/processing" + "github.com/superseriousbusiness/gotosocial/internal/router" +) + +const ( + // BasePath is the base path for serving the filter API + BasePath = "/api/v1/filters" +) + +// Module implements the ClientAPIModule interface for every related to filters +type Module struct { + config *config.Config + processor processing.Processor + log *logrus.Logger +} + +// New returns a new filter module +func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.ClientModule { + return &Module{ + config: config, + processor: processor, + log: log, + } +} + +// Route attaches all routes from this module to the given router +func (m *Module) Route(r router.Router) error { + r.AttachHandler(http.MethodGet, BasePath, m.FiltersGETHandler) + return nil +} diff --git a/internal/api/client/filter/filtersget.go b/internal/api/client/filter/filtersget.go new file mode 100644 index 000000000..ad9783eb2 --- /dev/null +++ b/internal/api/client/filter/filtersget.go @@ -0,0 +1,8 @@ +package filter + +import "github.com/gin-gonic/gin" + +// FiltersGETHandler returns a list of filters set by/for the authed account +func (m *Module) FiltersGETHandler(c *gin.Context) { + +} diff --git a/internal/api/client/list/list.go b/internal/api/client/list/list.go new file mode 100644 index 000000000..4f800a46e --- /dev/null +++ b/internal/api/client/list/list.go @@ -0,0 +1,56 @@ +/* + 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 list + +import ( + "net/http" + + "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/api" + "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/processing" + "github.com/superseriousbusiness/gotosocial/internal/router" +) + +const ( + // BasePath is the base path for serving the lists API + BasePath = "/api/v1/lists" +) + +// Module implements the ClientAPIModule interface for everything related to lists +type Module struct { + config *config.Config + processor processing.Processor + log *logrus.Logger +} + +// New returns a new list module +func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.ClientModule { + return &Module{ + config: config, + processor: processor, + log: log, + } +} + +// Route attaches all routes from this module to the given router +func (m *Module) Route(r router.Router) error { + r.AttachHandler(http.MethodGet, BasePath, m.ListsGETHandler) + return nil +} diff --git a/internal/api/client/list/listsgets.go b/internal/api/client/list/listsgets.go new file mode 100644 index 000000000..fd695454b --- /dev/null +++ b/internal/api/client/list/listsgets.go @@ -0,0 +1,8 @@ +package list + +import "github.com/gin-gonic/gin" + +// ListsGETHandler returns a list of lists created by/for the authed account +func (m *Module) ListsGETHandler(c *gin.Context) { + +} diff --git a/internal/api/client/notification/notification.go b/internal/api/client/notification/notification.go index 799d0a5e3..758fe505c 100644 --- a/internal/api/client/notification/notification.go +++ b/internal/api/client/notification/notification.go @@ -41,6 +41,8 @@ const ( MaxIDKey = "max_id" // LimitKey is for specifying maximum number of notifications to return. LimitKey = "limit" + // SinceIDKey is for specifying the minimum notification ID to return. + SinceIDKey = "since_id" ) // Module implements the ClientAPIModule interface for every related to posting/deleting/interacting with notifications diff --git a/internal/api/client/notification/notificationsget.go b/internal/api/client/notification/notificationsget.go index a2d049384..a30674750 100644 --- a/internal/api/client/notification/notificationsget.go +++ b/internal/api/client/notification/notificationsget.go @@ -62,7 +62,13 @@ func (m *Module) NotificationsGETHandler(c *gin.Context) { maxID = maxIDString } - notifs, errWithCode := m.processor.NotificationsGet(authed, limit, maxID) + sinceID := "" + sinceIDString := c.Query(SinceIDKey) + if sinceIDString != "" { + sinceID = sinceIDString + } + + notifs, errWithCode := m.processor.NotificationsGet(authed, limit, maxID, sinceID) if errWithCode != nil { l.Debugf("error processing notifications get: %s", errWithCode.Error()) c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) diff --git a/internal/api/client/status/status.go b/internal/api/client/status/status.go index e71764eb1..c5959edb0 100644 --- a/internal/api/client/status/status.go +++ b/internal/api/client/status/status.go @@ -95,8 +95,12 @@ func (m *Module) Route(r router.Router) error { r.AttachHandler(http.MethodPost, FavouritePath, m.StatusFavePOSTHandler) r.AttachHandler(http.MethodPost, UnfavouritePath, m.StatusUnfavePOSTHandler) + r.AttachHandler(http.MethodGet, FavouritedPath, m.StatusFavedByGETHandler) r.AttachHandler(http.MethodPost, ReblogPath, m.StatusBoostPOSTHandler) + r.AttachHandler(http.MethodGet, RebloggedPath, m.StatusBoostedByGETHandler) + + r.AttachHandler(http.MethodGet, ContextPath, m.StatusContextGETHandler) r.AttachHandler(http.MethodGet, BasePathWithID, m.muxHandler) return nil diff --git a/internal/api/client/status/statusboosted_by.go b/internal/api/client/status/statusboosted_by.go new file mode 100644 index 000000000..debcc1b22 --- /dev/null +++ b/internal/api/client/status/statusboosted_by.go @@ -0,0 +1,60 @@ +/* + 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 status + +import ( + "net/http" + + "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/oauth" +) + +// StatusBoostedByGETHandler is for serving a list of accounts that have boosted/reblogged a given status +func (m *Module) StatusBoostedByGETHandler(c *gin.Context) { + l := m.log.WithFields(logrus.Fields{ + "func": "StatusBoostedByGETHandler", + "request_uri": c.Request.RequestURI, + "user_agent": c.Request.UserAgent(), + "origin_ip": c.ClientIP(), + }) + l.Debugf("entering function") + + authed, err := oauth.Authed(c, true, true, true, true) // we don't really need an app here but we want everything else + if err != nil { + l.Errorf("error authing status boosted by request: %s", err) + c.JSON(http.StatusBadRequest, gin.H{"error": "not authed"}) + return + } + + targetStatusID := c.Param(IDKey) + if targetStatusID == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "no status id provided"}) + return + } + + mastoAccounts, err := m.processor.StatusBoostedBy(authed, targetStatusID) + if err != nil { + l.Debugf("error processing status boosted by request: %s", err) + c.JSON(http.StatusBadRequest, gin.H{"error": "bad request"}) + return + } + + c.JSON(http.StatusOK, mastoAccounts) +} diff --git a/internal/api/client/status/statuscontext.go b/internal/api/client/status/statuscontext.go new file mode 100644 index 000000000..83071f4a0 --- /dev/null +++ b/internal/api/client/status/statuscontext.go @@ -0,0 +1,60 @@ +/* + 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 status + +import ( + "net/http" + + "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/oauth" +) + +// StatusContextGETHandler returns the context around the given status ID. +func (m *Module) StatusContextGETHandler(c *gin.Context) { + l := m.log.WithFields(logrus.Fields{ + "func": "StatusContextGETHandler", + "request_uri": c.Request.RequestURI, + "user_agent": c.Request.UserAgent(), + "origin_ip": c.ClientIP(), + }) + l.Debugf("entering function") + + authed, err := oauth.Authed(c, true, true, true, true) + if err != nil { + l.Errorf("error authing status context request: %s", err) + c.JSON(http.StatusBadRequest, gin.H{"error": "not authed"}) + return + } + + targetStatusID := c.Param(IDKey) + if targetStatusID == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "no status id provided"}) + return + } + + statusContext, errWithCode := m.processor.StatusGetContext(authed, targetStatusID) + if errWithCode != nil { + l.Debugf("error getting status context: %s", errWithCode.Error()) + c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) + return + } + + c.JSON(http.StatusOK, statusContext) +} diff --git a/internal/api/client/timeline/home.go b/internal/api/client/timeline/home.go index c1f9ae5d2..977a464a0 100644 --- a/internal/api/client/timeline/home.go +++ b/internal/api/client/timeline/home.go @@ -36,7 +36,7 @@ import ( // limit -- show only limit number of statuses // local -- Return only local statuses? func (m *Module) HomeTimelineGETHandler(c *gin.Context) { - l := m.log.WithField("func", "AccountStatusesGETHandler") + l := m.log.WithField("func", "HomeTimelineGETHandler") authed, err := oauth.Authed(c, true, true, true, true) if err != nil { diff --git a/internal/api/client/timeline/public.go b/internal/api/client/timeline/public.go new file mode 100644 index 000000000..f4b233064 --- /dev/null +++ b/internal/api/client/timeline/public.go @@ -0,0 +1,92 @@ +/* + 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 timeline + +import ( + "net/http" + "strconv" + + "github.com/gin-gonic/gin" + "github.com/superseriousbusiness/gotosocial/internal/oauth" +) + +// PublicTimelineGETHandler handles PUBLIC timeline requests. +// This includes requests to local, which are actually just public +// requests with a filter. +func (m *Module) PublicTimelineGETHandler(c *gin.Context) { + l := m.log.WithField("func", "PublicTimelineGETHandler") + + authed, err := oauth.Authed(c, true, true, true, true) + if err != nil { + l.Debugf("error authing: %s", err) + c.JSON(http.StatusUnauthorized, gin.H{"error": "unauthorized"}) + return + } + + maxID := "" + maxIDString := c.Query(MaxIDKey) + if maxIDString != "" { + maxID = maxIDString + } + + sinceID := "" + sinceIDString := c.Query(SinceIDKey) + if sinceIDString != "" { + sinceID = sinceIDString + } + + minID := "" + minIDString := c.Query(MinIDKey) + if minIDString != "" { + minID = minIDString + } + + limit := 20 + limitString := c.Query(LimitKey) + if limitString != "" { + i, err := strconv.ParseInt(limitString, 10, 64) + if err != nil { + l.Debugf("error parsing limit string: %s", err) + c.JSON(http.StatusBadRequest, gin.H{"error": "couldn't parse limit query param"}) + return + } + limit = int(i) + } + + local := false + localString := c.Query(LocalKey) + if localString != "" { + i, err := strconv.ParseBool(localString) + if err != nil { + l.Debugf("error parsing local string: %s", err) + c.JSON(http.StatusBadRequest, gin.H{"error": "couldn't parse local query param"}) + return + } + local = i + } + + statuses, errWithCode := m.processor.PublicTimelineGet(authed, maxID, sinceID, minID, limit, local) + if errWithCode != nil { + l.Debugf("error from processor account statuses get: %s", errWithCode) + c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) + return + } + + c.JSON(http.StatusOK, statuses) +} diff --git a/internal/api/client/timeline/timeline.go b/internal/api/client/timeline/timeline.go index f563d6b7d..72c9357b1 100644 --- a/internal/api/client/timeline/timeline.go +++ b/internal/api/client/timeline/timeline.go @@ -1,5 +1,3 @@ -package timeline - /* GoToSocial Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org @@ -18,6 +16,8 @@ package timeline along with this program. If not, see <http://www.gnu.org/licenses/>. */ +package timeline + import ( "net/http" @@ -33,6 +33,8 @@ const ( BasePath = "/api/v1/timelines" // HomeTimeline is the path for the home timeline HomeTimeline = BasePath + "/home" + // PublicTimeline is the path for the public (and public local) timeline + PublicTimeline = BasePath + "/public" // MaxIDKey is the url query for setting a max status ID to return MaxIDKey = "max_id" // SinceIDKey is the url query for returning results newer than the given ID @@ -64,5 +66,6 @@ func New(config *config.Config, processor processing.Processor, log *logrus.Logg // Route attaches all routes from this module to the given router func (m *Module) Route(r router.Router) error { r.AttachHandler(http.MethodGet, HomeTimeline, m.HomeTimelineGETHandler) + r.AttachHandler(http.MethodGet, PublicTimeline, m.PublicTimelineGETHandler) return nil } |