I am stupid and IDs should not be UUID but string
All checks were successful
/ docker (push) Successful in 3m58s

Other software might use different IDs that aren't UUIDs, so shouldn't
lock own IDs into UUID either
This commit is contained in:
Melody Becker 2025-04-12 09:16:35 +02:00
parent 98e842f0b1
commit d4f2f66807
No known key found for this signature in database
3 changed files with 22 additions and 22 deletions

View file

@ -12,7 +12,7 @@ import (
// Instead, they are either stored on the remote server they originated from // Instead, they are either stored on the remote server they originated from
// or an s3 bucket if uploaded to Linstrom. // or an s3 bucket if uploaded to Linstrom.
type MediaMetadata struct { type MediaMetadata struct {
ID string `gorm:"primarykey;type:uuid;default:gen_random_uuid()"` // The unique ID of this media file ID string `gorm:"primarykey;default:gen_random_uuid()"` // The unique ID of this media file
CreatedAt time.Time // When this entry was created CreatedAt time.Time // When this entry was created
UpdatedAt time.Time // When this entry was last updated UpdatedAt time.Time // When this entry was last updated
// When this entry was deleted (for soft deletions) // When this entry was deleted (for soft deletions)

View file

@ -9,7 +9,7 @@ import (
// A note describes some user generated text content. // A note describes some user generated text content.
type Note struct { type Note struct {
ID string `gorm:"primarykey;type:uuid;default:gen_random_uuid()"` // Make ID a string (uuid) for other implementations ID string `gorm:"primarykey;default:gen_random_uuid()"` // Make ID a string (uuid) for other implementations
CreatedAt time.Time // When this entry was created CreatedAt time.Time // When this entry was created
UpdatedAt time.Time // When this entry was last updated UpdatedAt time.Time // When this entry was last updated
// When this entry was deleted (for soft deletions) // When this entry was deleted (for soft deletions)

View file

@ -25,35 +25,35 @@ type User struct {
// identifier for users and other servers, especially when changing the username // identifier for users and other servers, especially when changing the username
// (username != display name) might be a future feature // (username != display name) might be a future feature
// Same also applies for other types that use a UUID as primary key // Same also applies for other types that use a UUID as primary key
ID string `gorm:"primarykey;type:uuid;default:gen_random_uuid()" json:"id"` ID string `gorm:"primarykey;default:gen_random_uuid()" json:"id"`
// Username of the user (eg "max" if the full username is @max@example.com) // Username of the user (eg "max" if the full username is @max@example.com)
// Assume unchangable (once set by a user) to be kind to other implementations // Assume unchangable (once set by a user) to be kind to other implementations
// Would be an easy avenue to fuck with them though // Would be an easy avenue to fuck with them though
Username string `gorm:"unique" json:"username"` Username string `gorm:"unique" json:"username"`
CreatedAt time.Time ` json:"created_at"` // When this entry was created. Automatically set by gorm CreatedAt time.Time ` json:"created_at"` // When this entry was created. Automatically set by gorm
// When this account was last updated. Will also be used for refreshing remote accounts. Automatically set by gorm // When this account was last updated. Will also be used for refreshing remote accounts. Automatically set by gorm
UpdatedAt time.Time ` json:"updated_at"` UpdatedAt time.Time ` json:"updated_at"`
// When this entry was deleted (for soft deletions) // When this entry was deleted (for soft deletions)
// Soft delete means that this entry still exists in the db, but gorm won't include it anymore unless specifically told to // Soft delete means that this entry still exists in the db, but gorm won't include it anymore unless specifically told to
// If not null, this entry is marked as deleted // If not null, this entry is marked as deleted
DeletedAt gorm.DeletedAt `gorm:"index" json:"deleted_at"` DeletedAt gorm.DeletedAt `gorm:"index" json:"deleted_at"`
Server RemoteServer ` json:"-"` Server RemoteServer ` json:"-"`
ServerId uint ` json:"server_id"` // Id of the server this user is from, needed for including RemoteServer ServerId uint ` json:"server_id"` // Id of the server this user is from, needed for including RemoteServer
DisplayName string ` json:"display_name"` // The display name of the user. Can be different from the handle DisplayName string ` json:"display_name"` // The display name of the user. Can be different from the handle
Description string ` json:"description"` // The description of a user account Description string ` json:"description"` // The description of a user account
IsBot bool ` json:"is_bot"` // Whether to mark this account as a script controlled one IsBot bool ` json:"is_bot"` // Whether to mark this account as a script controlled one
Icon *MediaMetadata ` json:"-"` Icon *MediaMetadata ` json:"-"`
IconId sql.NullString ` json:"icon_id"` // ID of a media file used as icon IconId sql.NullString ` json:"icon_id"` // ID of a media file used as icon
Background *MediaMetadata ` json:"-"` Background *MediaMetadata ` json:"-"`
BackgroundId sql.NullString ` json:"background_id"` // ID of a media file used as background image BackgroundId sql.NullString ` json:"background_id"` // ID of a media file used as background image
Banner *MediaMetadata ` json:"-"` Banner *MediaMetadata ` json:"-"`
BannerId sql.NullString ` json:"banner_id"` // ID of a media file used as banner BannerId sql.NullString ` json:"banner_id"` // ID of a media file used as banner
Indexable bool ` json:"indexable"` // Whether this account can be found by crawlers Indexable bool ` json:"indexable"` // Whether this account can be found by crawlers
PublicKeyRsa []byte ` json:"public_key_rsa"` // The public RSA key of the account PublicKeyRsa []byte ` json:"public_key_rsa"` // The public RSA key of the account
PublicKeyEd []byte ` json:"public_key_ed"` // The public Ed25519 key of the account PublicKeyEd []byte ` json:"public_key_ed"` // The public Ed25519 key of the account
// Whether this account restricts following // Whether this account restricts following
// If true, the owner must approve of a follow request first // If true, the owner must approve of a follow request first
RestrictedFollow bool ` json:"restricted_follow"` RestrictedFollow bool ` json:"restricted_follow"`
Location sql.NullString `json:"location"` Location sql.NullString `json:"location"`
Birthday sql.NullTime `json:"birthday"` Birthday sql.NullTime `json:"birthday"`