SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[chore] Move local account settings to separate db table (#2770)

Browse Source 
* [chore] Move local account settings to separate database model

* don't use separate settings_id
This commit is contained in:
tobi
2024-03-22 14:03:46 +01:00
committed by GitHub
parent 0767647056
commit 7f4a0a1aeb
36 changed files with 525 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/trans/import.go
View File

@@ -25,6 +25,7 @@ import (
"io"
"os"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/log"
transmodel "github.com/superseriousbusiness/gotosocial/internal/trans/model"
)
@@ -73,6 +74,14 @@ func (i *importer) inputEntry(ctx context.Context, entry transmodel.Entry) error
if err := i.putInDB(ctx, account); err != nil {
return fmt.Errorf("inputEntry: error adding account to database: %s", err)
}
if account.Domain == "" && account.Username != config.GetHost() {
// Local, non-instance account.
// Insert barebones settings model.
settings := &transmodel.AccountSettings{AccountID: account.ID}
if err := i.putInDB(ctx, settings); err != nil {
return fmt.Errorf("inputEntry: error adding account settings to database: %s", err)
}
}
log.Infof(ctx, "added account with id %s", account.ID)
return nil
case transmodel.TransBlock: