diff options
| author |  Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> | 2021-06-13 18:42:28 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-06-13 18:42:28 +0200 |
| commit | b4288f3c47a9ff9254b933dcb9ee7274d4a4135c (patch) | |
| tree | 3fe1bb1ab8d4b8c5d9a83df708e5088f35c3150a /internal/gtsmodel/user.go | |
| parent | Tidy + timeline embetterment (#38) (diff) | |
| download | gotosocial-b4288f3c47a9ff9254b933dcb9ee7274d4a4135c.tar.xz | |
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
Diffstat (limited to 'internal/gtsmodel/user.go')
| -rw-r--r-- | internal/gtsmodel/user.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/gtsmodel/user.go b/internal/gtsmodel/user.go index a72569945..a1e912e99 100644 --- a/internal/gtsmodel/user.go +++ b/internal/gtsmodel/user.go @@ -31,11 +31,11 @@ type User struct { */ // id of this user in the local database; the end-user will never need to know this, it's strictly internal - ID string `pg:"type:uuid,default:gen_random_uuid(),pk,notnull,unique"` + ID string `pg:"type:CHAR(26),pk,notnull,unique"` // confirmed email address for this user, this should be unique -- only one email address registered per instance, multiple users per email are not supported Email string `pg:"default:null,unique"` // The id of the local gtsmodel.Account entry for this user, if it exists (unconfirmed users don't have an account yet) - AccountID string `pg:"default:'',notnull,unique"` + AccountID string `pg:"type:CHAR(26),unique"` // The encrypted password of this user, generated using https://pkg.go.dev/golang.org/x/crypto/bcrypt#GenerateFromPassword. A salt is included so we're safe against 🌈 tables EncryptedPassword string `pg:",notnull"` @@ -60,7 +60,7 @@ type User struct { // How many times has this user signed in? SignInCount int // id of the user who invited this user (who let this guy in?) - InviteID string + InviteID string `pg:"type:CHAR(26)"` // What languages does this user want to see? ChosenLanguages []string // What languages does this user not want to see? @@ -68,7 +68,7 @@ type User struct { // In what timezone/locale is this user located? Locale string // Which application id created this user? See gtsmodel.Application - CreatedByApplicationID string + CreatedByApplicationID string `pg:"type:CHAR(26)"` // When did we last contact this user LastEmailedAt time.Time `pg:"type:timestamp"` |