summaryrefslogtreecommitdiff
path: root/internal/cliactions/server
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2021-09-09 16:15:25 +0200
committerLibravatar GitHub <noreply@github.com>2021-09-09 16:15:25 +0200
commit555ea8edfb2c30d149b3ca6cb0fbe53f2798c7bc (patch)
tree24567c4c365a007fcd2d6603e696b363129abb77 /internal/cliactions/server
parentMerge pull request #198 from NyaaaWhatsUpDoc/update/sqlite-library (diff)
downloadgotosocial-555ea8edfb2c30d149b3ca6cb0fbe53f2798c7bc.tar.xz
Import export (#194)
* start with export/import code * messing about with decoding/encoding * some more fiddling * stuff is WORKING * working pretty alright! * go fmt * fix up tests, add docs * start backup/restore doc * tweaks * credits * update advancedVisibility settings * update bun library -> v1.0.4 Signed-off-by: kim (grufwub) <grufwub@gmail.com> * update oauth library -> v4.3.1-SSB Signed-off-by: kim (grufwub) <grufwub@gmail.com> * handle oauth token scope, fix user.SigninCount + token.UserID Signed-off-by: kim (grufwub) <grufwub@gmail.com> * update oauth library --> v4.3.2-SSB Signed-off-by: kim (grufwub) <grufwub@gmail.com> * update sqlite library -> v1.13.0 Signed-off-by: kim (grufwub) <grufwub@gmail.com> * review changes * start with export/import code * messing about with decoding/encoding * some more fiddling * stuff is WORKING * working pretty alright! * go fmt * fix up tests, add docs * start backup/restore doc * tweaks * credits * update advancedVisibility settings * review changes Co-authored-by: kim (grufwub) <grufwub@gmail.com> Co-authored-by: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Diffstat (limited to 'internal/cliactions/server')
-rw-r--r--internal/cliactions/server/server.go33
1 files changed, 2 insertions, 31 deletions
diff --git a/internal/cliactions/server/server.go b/internal/cliactions/server/server.go
index 0769ade82..3ef714fb0 100644
--- a/internal/cliactions/server/server.go
+++ b/internal/cliactions/server/server.go
@@ -39,7 +39,6 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/federation"
"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb"
"github.com/superseriousbusiness/gotosocial/internal/gotosocial"
- "github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/oidc"
@@ -51,32 +50,6 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/web"
)
-var models []interface{} = []interface{}{
- &gtsmodel.Account{},
- &gtsmodel.Application{},
- &gtsmodel.Block{},
- &gtsmodel.DomainBlock{},
- &gtsmodel.EmailDomainBlock{},
- &gtsmodel.Follow{},
- &gtsmodel.FollowRequest{},
- &gtsmodel.MediaAttachment{},
- &gtsmodel.Mention{},
- &gtsmodel.Status{},
- &gtsmodel.StatusToEmoji{},
- &gtsmodel.StatusToTag{},
- &gtsmodel.StatusFave{},
- &gtsmodel.StatusBookmark{},
- &gtsmodel.StatusMute{},
- &gtsmodel.Tag{},
- &gtsmodel.User{},
- &gtsmodel.Emoji{},
- &gtsmodel.Instance{},
- &gtsmodel.Notification{},
- &gtsmodel.RouterSession{},
- &gtsmodel.Token{},
- &gtsmodel.Client{},
-}
-
// Start creates and starts a gotosocial server
var Start cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
dbService, err := bundb.NewBunDBService(ctx, c, log)
@@ -84,10 +57,8 @@ var Start cliactions.GTSAction = func(ctx context.Context, c *config.Config, log
return fmt.Errorf("error creating dbservice: %s", err)
}
- for _, m := range models {
- if err := dbService.CreateTable(ctx, m); err != nil {
- return fmt.Errorf("table creation error: %s", err)
- }
+ if err := dbService.CreateAllTables(ctx); err != nil {
+ return fmt.Errorf("error creating database tables: %s", err)
}
if err := dbService.CreateInstanceAccount(ctx); err != nil {