From b4288f3c47a9ff9254b933dcb9ee7274d4a4135c Mon Sep 17 00:00:00 2001
From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com>
Date: Sun, 13 Jun 2021 18:42:28 +0200
Subject: Timeline manager (#40)

* start messing about with timeline manager

* i have no idea what i'm doing

* i continue to not know what i'm doing

* it's coming along

* bit more progress

* update timeline with new posts as they come in

* lint and fmt

* Select accounts where empty string

* restructure a bunch, get unfaves working

* moving stuff around

* federate status deletes properly

* mention regex better but not 100% there

* fix regex

* some more hacking away at the timeline code phew

* fix up some little things

* i can't even

* more timeline stuff

* move to ulid

* fiddley

* some lil fixes for kibou compatibility

* timelines working pretty alright!

* tidy + lint
---
 internal/processing/followrequest.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'internal/processing/followrequest.go')

diff --git a/internal/processing/followrequest.go b/internal/processing/followrequest.go
index 7e606f5da..5eb9fd6ad 100644
--- a/internal/processing/followrequest.go
+++ b/internal/processing/followrequest.go
@@ -21,15 +21,16 @@ package processing
 import (
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
 )
 
-func (p *processor) FollowRequestsGet(auth *oauth.Auth) ([]apimodel.Account, ErrorWithCode) {
+func (p *processor) FollowRequestsGet(auth *oauth.Auth) ([]apimodel.Account, gtserror.WithCode) {
 	frs := []gtsmodel.FollowRequest{}
 	if err := p.db.GetFollowRequestsForAccountID(auth.Account.ID, &frs); err != nil {
 		if _, ok := err.(db.ErrNoEntries); !ok {
-			return nil, NewErrorInternalError(err)
+			return nil, gtserror.NewErrorInternalError(err)
 		}
 	}
 
@@ -37,31 +38,31 @@ func (p *processor) FollowRequestsGet(auth *oauth.Auth) ([]apimodel.Account, Err
 	for _, fr := range frs {
 		acct := &gtsmodel.Account{}
 		if err := p.db.GetByID(fr.AccountID, acct); err != nil {
-			return nil, NewErrorInternalError(err)
+			return nil, gtserror.NewErrorInternalError(err)
 		}
 		mastoAcct, err := p.tc.AccountToMastoPublic(acct)
 		if err != nil {
-			return nil, NewErrorInternalError(err)
+			return nil, gtserror.NewErrorInternalError(err)
 		}
 		accts = append(accts, *mastoAcct)
 	}
 	return accts, nil
 }
 
-func (p *processor) FollowRequestAccept(auth *oauth.Auth, accountID string) (*apimodel.Relationship, ErrorWithCode) {
+func (p *processor) FollowRequestAccept(auth *oauth.Auth, accountID string) (*apimodel.Relationship, gtserror.WithCode) {
 	follow, err := p.db.AcceptFollowRequest(accountID, auth.Account.ID)
 	if err != nil {
-		return nil, NewErrorNotFound(err)
+		return nil, gtserror.NewErrorNotFound(err)
 	}
 
 	originAccount := &gtsmodel.Account{}
 	if err := p.db.GetByID(follow.AccountID, originAccount); err != nil {
-		return nil, NewErrorInternalError(err)
+		return nil, gtserror.NewErrorInternalError(err)
 	}
 
 	targetAccount := &gtsmodel.Account{}
 	if err := p.db.GetByID(follow.TargetAccountID, targetAccount); err != nil {
-		return nil, NewErrorInternalError(err)
+		return nil, gtserror.NewErrorInternalError(err)
 	}
 
 	p.fromClientAPI <- gtsmodel.FromClientAPI{
@@ -74,17 +75,17 @@ func (p *processor) FollowRequestAccept(auth *oauth.Auth, accountID string) (*ap
 
 	gtsR, err := p.db.GetRelationship(auth.Account.ID, accountID)
 	if err != nil {
-		return nil, NewErrorInternalError(err)
+		return nil, gtserror.NewErrorInternalError(err)
 	}
 
 	r, err := p.tc.RelationshipToMasto(gtsR)
 	if err != nil {
-		return nil, NewErrorInternalError(err)
+		return nil, gtserror.NewErrorInternalError(err)
 	}
 
 	return r, nil
 }
 
-func (p *processor) FollowRequestDeny(auth *oauth.Auth) ErrorWithCode {
+func (p *processor) FollowRequestDeny(auth *oauth.Auth) gtserror.WithCode {
 	return nil
 }
-- 
cgit v1.2.3