diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2025-04-06 14:39:40 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2025-04-06 14:39:40 +0200 |
| commit | 8ae2440da3a9b66c379c5a9444b50e758deef61b (patch) | |
| tree | 06b3ba58208434f6ddbd198a396159ac2c4d9c80 /internal/trans | |
| parent | [feature] Allow deleting avatar + header via settings panel (#3970) (diff) | |
| download | gotosocial-8ae2440da3a9b66c379c5a9444b50e758deef61b.tar.xz | |
[chore] Migrate accounts to new table, relax uniqueness constraint of actor `url` and collections (#3928)
* [chore] Migrate accounts to new table, relax uniqueness constraint of actor url and collections
* fiddle with it! (that's what she said)
* remove unused cache fields
* sillyness
* fix tiny whoopsie
Diffstat (limited to 'internal/trans')
| -rw-r--r-- | internal/trans/import_test.go | 3 | ||||
| -rw-r--r-- | internal/trans/model/account.go | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/internal/trans/import_test.go b/internal/trans/import_test.go index 5177ec45b..12094f27e 100644 --- a/internal/trans/import_test.go +++ b/internal/trans/import_test.go @@ -103,8 +103,7 @@ func (suite *ImportMinimalTestSuite) TestImportMinimalOK() { suite.Equal(testAccountBefore.DisplayName, testAccountAfter.DisplayName) suite.Equal(testAccountBefore.Note, testAccountAfter.Note) suite.Equal(testAccountBefore.NoteRaw, testAccountAfter.NoteRaw) - suite.Equal(testAccountBefore.Memorial, testAccountAfter.Memorial) - suite.Equal(testAccountBefore.Bot, testAccountAfter.Bot) + suite.Equal(testAccountBefore.MemorializedAt, testAccountAfter.MemorializedAt) suite.Equal(testAccountBefore.Locked, testAccountAfter.Locked) suite.Equal(testAccountBefore.URI, testAccountAfter.URI) suite.Equal(testAccountBefore.URL, testAccountAfter.URL) diff --git a/internal/trans/model/account.go b/internal/trans/model/account.go index 097dea3a3..ffcb0d5ae 100644 --- a/internal/trans/model/account.go +++ b/internal/trans/model/account.go @@ -34,8 +34,6 @@ type Account struct { DisplayName string `json:"displayName,omitempty" bun:",nullzero"` Note string `json:"note,omitempty" bun:",nullzero"` NoteRaw string `json:"noteRaw,omitempty" bun:",nullzero"` - Memorial *bool `json:"memorial"` - Bot *bool `json:"bot"` Locked *bool `json:"locked"` Discoverable *bool `json:"discoverable"` URI string `json:"uri" bun:",nullzero"` @@ -45,7 +43,7 @@ type Account struct { FollowingURI string `json:"followingUri" bun:",nullzero"` FollowersURI string `json:"followersUri" bun:",nullzero"` FeaturedCollectionURI string `json:"featuredCollectionUri" bun:",nullzero"` - ActorType string `json:"actorType" bun:",nullzero"` + ActorType int16 `json:"actorType" bun:",nullzero"` PrivateKey *rsa.PrivateKey `json:"-" mapstructure:"-"` PrivateKeyString string `json:"privateKey,omitempty" mapstructure:"privateKey" bun:"-"` PublicKey *rsa.PublicKey `json:"-" mapstructure:"-"` |