mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 04:52:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor/tidy (#261)

Browse source 
* tidy up streaming

* cut down code duplication

* test get followers/following

* test streaming processor

* fix some test models

* add TimeMustParse

* fix uri / url typo

* make trace logging less verbose

* make logging more consistent

* disable quote on logging

* remove context.Background

* remove many extraneous mastodon references

* regenerate swagger

* don't log query on no rows result

* log latency first for easier reading
This commit is contained in:
tobi 2021-10-04 15:24:19 +02:00 • committed by GitHub
commit e04b187702
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
126 changed files with 1192 additions and 955 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testrig/oauthserver.go
View file

@ -19,11 +19,13 @@
package testrig
import (
"context"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)
// NewTestOauthServer returns an oauth server with the given db, and the default test logger.
func NewTestOauthServer(db db.DB) oauth.Server {
return oauth.New(db, NewTestLog())
return oauth.New(context.Background(), db, NewTestLog())
}

6
testrig/testmodels.go
View file

@ -58,7 +58,7 @@ func NewTestTokens() map[string]*gtsmodel.Token {
"local_account_2": {
ID: "01F8MGVVM1EDVYET710J27XY5R",
ClientID: "01F8MGW47HN8ZXNHNZ7E47CDMQ",
UserID: "01F8MGWAPB4GJ42M4N0TCZSQ7K",
UserID: "01F8MH1VYJAE00TVVGMM5JNJ8X",
RedirectURI: "http://localhost:8080",
Scope: "read write follow push",
Access: "PIPINALKNNNFNF98717NAMNAMNFKIJKJ881818KJKJAKJJJA",
@ -88,7 +88,7 @@ func NewTestClients() map[string]*gtsmodel.Client {
ID: "01F8MGW47HN8ZXNHNZ7E47CDMQ",
Secret: "8f5603a5-c721-46cd-8f1b-2e368f51379f",
Domain: "http://localhost:8080",
UserID: "01F8MGWAPB4GJ42M4N0TCZSQ7K", // local_account_2
UserID: "01F8MH1VYJAE00TVVGMM5JNJ8X", // local_account_2
},
}
return clients
@ -420,7 +420,7 @@ func NewTestAccounts() map[string]*gtsmodel.Account {
Note: "i post about like, i dunno, stuff, or whatever!!!!",
Memorial: false,
MovedToAccountID: "",
CreatedAt: time.Now().Add(-190 * time.Hour),
CreatedAt: TimeMustParse("2021-09-26T12:52:36+02:00"),
UpdatedAt: time.Now().Add(-36 * time.Hour),
Bot: false,
Locked: false,

11
testrig/util.go
View file

@ -24,6 +24,7 @@ import (
"mime/multipart"
"net/url"
"os"
"time"
)
// CreateMultipartFormData is a handy function for taking a fieldname and a filename, and creating a multipart form bytes buffer
@ -76,3 +77,13 @@ func URLMustParse(stringURL string) *url.URL {
}
return u
}
// TimeMustParse tries to parse the given time as RFC3339, and panics if it can't.
// Should only be used in tests.
func TimeMustParse(timeString string) time.Time {
t, err := time.Parse(time.RFC3339, timeString)
if err != nil {
panic(err)
}
return t
}