diff options
Diffstat (limited to 'internal/processing/streaming')
| -rw-r--r-- | internal/processing/streaming/authorize.go | 8 | ||||
| -rw-r--r-- | internal/processing/streaming/openstream.go | 3 | ||||
| -rw-r--r-- | internal/processing/streaming/streaming.go | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/internal/processing/streaming/authorize.go b/internal/processing/streaming/authorize.go index 8bbf1856d..f938a0c0c 100644 --- a/internal/processing/streaming/authorize.go +++ b/internal/processing/streaming/authorize.go @@ -7,7 +7,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) -func (p *processor) AuthorizeStreamingRequest(accessToken string) (*gtsmodel.Account, error) { +func (p *processor) AuthorizeStreamingRequest(ctx context.Context, accessToken string) (*gtsmodel.Account, error) { ti, err := p.oauthServer.LoadAccessToken(context.Background(), accessToken) if err != nil { return nil, fmt.Errorf("AuthorizeStreamingRequest: error loading access token: %s", err) @@ -20,12 +20,12 @@ func (p *processor) AuthorizeStreamingRequest(accessToken string) (*gtsmodel.Acc // fetch user's and account for this user id user := >smodel.User{} - if err := p.db.GetByID(uid, user); err != nil || user == nil { + if err := p.db.GetByID(ctx, uid, user); err != nil || user == nil { return nil, fmt.Errorf("AuthorizeStreamingRequest: no user found for validated uid %s", uid) } - acct := >smodel.Account{} - if err := p.db.GetByID(user.AccountID, acct); err != nil || acct == nil { + acct, err := p.db.GetAccountByID(ctx, user.AccountID) + if err != nil || acct == nil { return nil, fmt.Errorf("AuthorizeStreamingRequest: no account retrieved for user with id %s", uid) } diff --git a/internal/processing/streaming/openstream.go b/internal/processing/streaming/openstream.go index 68446bac6..dfad5398e 100644 --- a/internal/processing/streaming/openstream.go +++ b/internal/processing/streaming/openstream.go @@ -1,6 +1,7 @@ package streaming import ( + "context" "errors" "fmt" @@ -10,7 +11,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/id" ) -func (p *processor) OpenStreamForAccount(account *gtsmodel.Account, streamType string) (*gtsmodel.Stream, gtserror.WithCode) { +func (p *processor) OpenStreamForAccount(ctx context.Context, account *gtsmodel.Account, streamType string) (*gtsmodel.Stream, gtserror.WithCode) { l := p.log.WithFields(logrus.Fields{ "func": "OpenStreamForAccount", "account": account.ID, diff --git a/internal/processing/streaming/streaming.go b/internal/processing/streaming/streaming.go index de75b8f27..f349a655a 100644 --- a/internal/processing/streaming/streaming.go +++ b/internal/processing/streaming/streaming.go @@ -1,6 +1,7 @@ package streaming import ( + "context" "sync" "github.com/sirupsen/logrus" @@ -17,9 +18,9 @@ import ( // Processor wraps a bunch of functions for processing streaming. type Processor interface { // AuthorizeStreamingRequest returns an oauth2 token info in response to an access token query from the streaming API - AuthorizeStreamingRequest(accessToken string) (*gtsmodel.Account, error) + AuthorizeStreamingRequest(ctx context.Context, accessToken string) (*gtsmodel.Account, error) // OpenStreamForAccount returns a new Stream for the given account, which will contain a channel for passing messages back to the caller. - OpenStreamForAccount(account *gtsmodel.Account, streamType string) (*gtsmodel.Stream, gtserror.WithCode) + OpenStreamForAccount(ctx context.Context, account *gtsmodel.Account, streamType string) (*gtsmodel.Stream, gtserror.WithCode) // StreamStatusToAccount streams the given status to any open, appropriate streams belonging to the given account. StreamStatusToAccount(s *apimodel.Status, account *gtsmodel.Account) error // StreamNotificationToAccount streams the given notification to any open, appropriate streams belonging to the given account. |