diff options
| author | 2021-07-09 18:32:48 +0200 | |
|---|---|---|
| committer | 2021-07-09 18:32:48 +0200 | |
| commit | c7da64922f8b41daaee1cb8fc2961f7fa1336737 (patch) | |
| tree | b1f9c946bd223267f87f2a77a7455974d8d5e5e9 /internal/api | |
| parent | Docs (#94) (diff) | |
| download | gotosocial-c7da64922f8b41daaee1cb8fc2961f7fa1336737.tar.xz | |
favourites GET implementation (#95)
Diffstat (limited to 'internal/api')
| -rw-r--r-- | internal/api/client/favourites/favourites.go | 67 | ||||
| -rw-r--r-- | internal/api/client/favourites/favouritesget.go | 57 | ||||
| -rw-r--r-- | internal/api/client/timeline/home.go | 4 | ||||
| -rw-r--r-- | internal/api/client/timeline/public.go | 9 | 
4 files changed, 133 insertions, 4 deletions
diff --git a/internal/api/client/favourites/favourites.go b/internal/api/client/favourites/favourites.go new file mode 100644 index 000000000..e083f32f9 --- /dev/null +++ b/internal/api/client/favourites/favourites.go @@ -0,0 +1,67 @@ +/* +   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 favourites + +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 URI path for serving favourites +	BasePath = "/api/v1/favourites" + +	// 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 +	SinceIDKey = "since_id" +	// MinIDKey is the url query for returning results immediately newer than the given ID +	MinIDKey = "min_id" +	// LimitKey is for specifying maximum number of results to return. +	LimitKey = "limit" +	// LocalKey is for specifying whether only local statuses should be returned +	LocalKey = "local" +) + +// Module implements the ClientAPIModule interface for everything relating to viewing favourites +type Module struct { +	config    *config.Config +	processor processing.Processor +	log       *logrus.Logger +} + +// New returns a new favourites 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.FavouritesGETHandler) +	return nil +} diff --git a/internal/api/client/favourites/favouritesget.go b/internal/api/client/favourites/favouritesget.go new file mode 100644 index 000000000..76eb921e0 --- /dev/null +++ b/internal/api/client/favourites/favouritesget.go @@ -0,0 +1,57 @@ +package favourites + +import ( +	"net/http" +	"strconv" + +	"github.com/gin-gonic/gin" +	"github.com/superseriousbusiness/gotosocial/internal/oauth" +) + +// FavouritesGETHandler handles GETting favourites. +func (m *Module) FavouritesGETHandler(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 +	} + +	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) +	} + +	resp, errWithCode := m.processor.FavedTimelineGet(authed, maxID, minID, limit) +	if errWithCode != nil { +		l.Debugf("error from processor FavedTimelineGet: %s", errWithCode) +		c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) +		return +	} + +	if resp.LinkHeader != "" { +		c.Header("Link", resp.LinkHeader) +	} +	c.JSON(http.StatusOK, resp.Statuses) +} diff --git a/internal/api/client/timeline/home.go b/internal/api/client/timeline/home.go index 86606a0dd..cb72895f9 100644 --- a/internal/api/client/timeline/home.go +++ b/internal/api/client/timeline/home.go @@ -94,6 +94,8 @@ func (m *Module) HomeTimelineGETHandler(c *gin.Context) {  		return  	} -	c.Header("Link", resp.LinkHeader) +	if resp.LinkHeader != "" { +		c.Header("Link", resp.LinkHeader) +	}  	c.JSON(http.StatusOK, resp.Statuses)  } diff --git a/internal/api/client/timeline/public.go b/internal/api/client/timeline/public.go index f4b233064..6898d781b 100644 --- a/internal/api/client/timeline/public.go +++ b/internal/api/client/timeline/public.go @@ -81,12 +81,15 @@ func (m *Module) PublicTimelineGETHandler(c *gin.Context) {  		local = i  	} -	statuses, errWithCode := m.processor.PublicTimelineGet(authed, maxID, sinceID, minID, limit, local) +	resp, errWithCode := m.processor.PublicTimelineGet(authed, maxID, sinceID, minID, limit, local)  	if errWithCode != nil { -		l.Debugf("error from processor account statuses get: %s", errWithCode) +		l.Debugf("error from processor PublicTimelineGet: %s", errWithCode)  		c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()})  		return  	} -	c.JSON(http.StatusOK, statuses) +	if resp.LinkHeader != "" { +		c.Header("Link", resp.LinkHeader) +	} +	c.JSON(http.StatusOK, resp.Statuses)  }  | 
