From 32c5fd987a06e11b14a4247d13187657c14adedd Mon Sep 17 00:00:00 2001
From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 19 Apr 2021 19:42:19 +0200
Subject: Api/v1/statuses (#11)

This PR adds:
Statuses

    New status creation.
    View existing status
    Delete a status
    Fave a status
    Unfave a status
    See who's faved a status

Media

    Upload media attachment and store/retrieve it
    Upload custom emoji and store/retrieve it

Fileserver

    Serve files from storage

Testing

    Test models, testrig -- run a GTS test instance and play around with it.
---
 internal/oauth/server.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'internal/oauth/server.go')

diff --git a/internal/oauth/server.go b/internal/oauth/server.go
index 8bac8fc2f..538288922 100644
--- a/internal/oauth/server.go
+++ b/internal/oauth/server.go
@@ -26,7 +26,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
-	"github.com/superseriousbusiness/gotosocial/internal/db/model"
+	"github.com/superseriousbusiness/gotosocial/internal/db/gtsmodel"
 	"github.com/superseriousbusiness/oauth2/v4"
 	"github.com/superseriousbusiness/oauth2/v4/errors"
 	"github.com/superseriousbusiness/oauth2/v4/manage"
@@ -34,6 +34,9 @@ import (
 )
 
 const (
+	// SessionAuthorizedToken is the key set in the gin context for the Token
+	// of a User who has successfully passed Bearer token authorization.
+	// The interface returned from grabbing this key should be parsed as oauth2.TokenInfo
 	SessionAuthorizedToken = "authorized_token"
 	// SessionAuthorizedUser is the key set in the gin context for the id of
 	// a User who has successfully passed Bearer token authorization.
@@ -65,9 +68,9 @@ type s struct {
 
 type Authed struct {
 	Token       oauth2.TokenInfo
-	Application *model.Application
-	User        *model.User
-	Account     *model.Account
+	Application *gtsmodel.Application
+	User        *gtsmodel.User
+	Account     *gtsmodel.Account
 }
 
 // GetAuthed is a convenience function for returning an Authed struct from a gin context.
@@ -96,7 +99,7 @@ func GetAuthed(c *gin.Context) (*Authed, error) {
 
 	i, ok = ctx.Get(SessionAuthorizedApplication)
 	if ok {
-		parsed, ok := i.(*model.Application)
+		parsed, ok := i.(*gtsmodel.Application)
 		if !ok {
 			return nil, errors.New("could not parse application from session context")
 		}
@@ -105,7 +108,7 @@ func GetAuthed(c *gin.Context) (*Authed, error) {
 
 	i, ok = ctx.Get(SessionAuthorizedUser)
 	if ok {
-		parsed, ok := i.(*model.User)
+		parsed, ok := i.(*gtsmodel.User)
 		if !ok {
 			return nil, errors.New("could not parse user from session context")
 		}
@@ -114,7 +117,7 @@ func GetAuthed(c *gin.Context) (*Authed, error) {
 
 	i, ok = ctx.Get(SessionAuthorizedAccount)
 	if ok {
-		parsed, ok := i.(*model.Account)
+		parsed, ok := i.(*gtsmodel.Account)
 		if !ok {
 			return nil, errors.New("could not parse account from session context")
 		}
-- 
cgit v1.2.3