diff options
Diffstat (limited to 'internal/gtsmodel')
| -rw-r--r-- | internal/gtsmodel/account.go | 18 | ||||
| -rw-r--r-- | internal/gtsmodel/application.go | 14 | ||||
| -rw-r--r-- | internal/gtsmodel/domainblock.go | 4 | ||||
| -rw-r--r-- | internal/gtsmodel/emoji.go | 8 | ||||
| -rw-r--r-- | internal/gtsmodel/follow.go | 2 | ||||
| -rw-r--r-- | internal/gtsmodel/instance.go | 14 | ||||
| -rw-r--r-- | internal/gtsmodel/mediaattachment.go | 24 | ||||
| -rw-r--r-- | internal/gtsmodel/status.go | 14 | ||||
| -rw-r--r-- | internal/gtsmodel/tag.go | 2 | ||||
| -rw-r--r-- | internal/gtsmodel/user.go | 20 |
10 files changed, 60 insertions, 60 deletions
diff --git a/internal/gtsmodel/account.go b/internal/gtsmodel/account.go index 98d2dcfc9..a59746be5 100644 --- a/internal/gtsmodel/account.go +++ b/internal/gtsmodel/account.go @@ -48,20 +48,20 @@ type Account struct { AvatarMediaAttachmentID string `bun:"type:CHAR(26),nullzero"` AvatarMediaAttachment *MediaAttachment `bun:"rel:belongs-to"` // For a non-local account, where can the header be fetched? - AvatarRemoteURL string + AvatarRemoteURL string `bun:",nullzero"` // ID of the header as a media attachment HeaderMediaAttachmentID string `bun:"type:CHAR(26),nullzero"` HeaderMediaAttachment *MediaAttachment `bun:"rel:belongs-to"` // For a non-local account, where can the header be fetched? - HeaderRemoteURL string + HeaderRemoteURL string `bun:",nullzero"` // DisplayName for this account. Can be empty, then just the Username will be used for display purposes. - DisplayName string + DisplayName string `bun:",nullzero"` // a key/value map of fields that this account has added to their profile Fields []Field // A note that this account has on their profile (ie., the account's bio/description of themselves) - Note string + Note string `bun:",nullzero"` // Is this a memorial account, ie., has the user passed away? - Memorial bool + Memorial bool `bun:",nullzero"` // This account has moved this account id in the database MovedToAccountID string `bun:"type:CHAR(26),nullzero"` // When was this account created? @@ -71,7 +71,7 @@ type Account struct { // Does this account identify itself as a bot? Bot bool // What reason was given for signing up when this account was created? - Reason string + Reason string `bun:",nullzero"` /* USER AND PRIVACY PREFERENCES @@ -109,9 +109,9 @@ type Account struct { // URL for getting the featured collection list of this account FeaturedCollectionURI string `bun:",unique,nullzero"` // What type of activitypub actor is this account? - ActorType string + ActorType string `bun:",nullzero"` // This account is associated with x account id - AlsoKnownAs string + AlsoKnownAs string `bun:",nullzero"` /* CRYPTO FIELDS @@ -122,7 +122,7 @@ type Account struct { // Publickey for encoding activitypub requests, will be defined for both local and remote accounts PublicKey *rsa.PublicKey // Web-reachable location of this account's public key - PublicKeyURI string + PublicKeyURI string `bun:",nullzero"` /* ADMIN FIELDS diff --git a/internal/gtsmodel/application.go b/internal/gtsmodel/application.go index a6976eafd..12a21d298 100644 --- a/internal/gtsmodel/application.go +++ b/internal/gtsmodel/application.go @@ -24,17 +24,17 @@ type Application struct { // id of this application in the db ID string `bun:"type:CHAR(26),pk,notnull"` // name of the application given when it was created (eg., 'tusky') - Name string + Name string `bun:",nullzero"` // website for the application given when it was created (eg., 'https://tusky.app') - Website string + Website string `bun:",nullzero"` // redirect uri requested by the application for oauth2 flow - RedirectURI string + RedirectURI string `bun:",nullzero"` // id of the associated oauth client entity in the db - ClientID string `bun:"type:CHAR(26)"` + ClientID string `bun:"type:CHAR(26),nullzero"` // secret of the associated oauth client entity in the db - ClientSecret string + ClientSecret string `bun:",nullzero"` // scopes requested when this app was created - Scopes string + Scopes string `bun:",nullzero"` // a vapid key generated for this app when it was created - VapidKey string + VapidKey string `bun:",nullzero"` } diff --git a/internal/gtsmodel/domainblock.go b/internal/gtsmodel/domainblock.go index 03d5ab0af..784e665a5 100644 --- a/internal/gtsmodel/domainblock.go +++ b/internal/gtsmodel/domainblock.go @@ -34,9 +34,9 @@ type DomainBlock struct { CreatedByAccountID string `bun:"type:CHAR(26),notnull"` CreatedByAccount *Account `bun:"rel:belongs-to"` // Private comment on this block, viewable to admins - PrivateComment string + PrivateComment string `bun:",nullzero"` // Public comment on this block, viewable (optionally) by everyone - PublicComment string + PublicComment string `bun:",nullzero"` // whether the domain name should appear obfuscated when displaying it publicly Obfuscate bool // if this block was created through a subscription, what's the subscription ID? diff --git a/internal/gtsmodel/emoji.go b/internal/gtsmodel/emoji.go index 3b02c14e7..9723f0790 100644 --- a/internal/gtsmodel/emoji.go +++ b/internal/gtsmodel/emoji.go @@ -36,19 +36,19 @@ type Emoji struct { // Where can this emoji be retrieved remotely? Null for local emojis. // For remote emojis, it'll be something like: // https://hackers.town/system/custom_emojis/images/000/049/842/original/1b74481204feabfd.png - ImageRemoteURL string + ImageRemoteURL string `bun:",nullzero"` // Where can a static / non-animated version of this emoji be retrieved remotely? Null for local emojis. // For remote emojis, it'll be something like: // https://hackers.town/system/custom_emojis/images/000/049/842/static/1b74481204feabfd.png - ImageStaticRemoteURL string + ImageStaticRemoteURL string `bun:",nullzero"` // Where can this emoji be retrieved from the local server? Null for remote emojis. // Assuming our server is hosted at 'example.org', this will be something like: // 'https://example.org/fileserver/6339820e-ef65-4166-a262-5a9f46adb1a7/emoji/original/bfa6c9c5-6c25-4ea4-98b4-d78b8126fb52.png' - ImageURL string + ImageURL string `bun:",nullzero"` // Where can a static version of this emoji be retrieved from the local server? Null for remote emojis. // Assuming our server is hosted at 'example.org', this will be something like: // 'https://example.org/fileserver/6339820e-ef65-4166-a262-5a9f46adb1a7/emoji/small/bfa6c9c5-6c25-4ea4-98b4-d78b8126fb52.png' - ImageStaticURL string + ImageStaticURL string `bun:",nullzero"` // Path of the emoji image in the server storage system. Will be something like: // '/gotosocial/storage/6339820e-ef65-4166-a262-5a9f46adb1a7/emoji/original/bfa6c9c5-6c25-4ea4-98b4-d78b8126fb52.png' ImagePath string `bun:",notnull"` diff --git a/internal/gtsmodel/follow.go b/internal/gtsmodel/follow.go index 3d3eb1f1b..1e1095af9 100644 --- a/internal/gtsmodel/follow.go +++ b/internal/gtsmodel/follow.go @@ -37,7 +37,7 @@ type Follow struct { // Does this follow also want to see reblogs and not just posts? ShowReblogs bool `bun:"default:true"` // What is the activitypub URI of this follow? - URI string `bun:",unique"` + URI string `bun:",unique,nullzero"` // does the following account want to be notified when the followed account posts? Notify bool } diff --git a/internal/gtsmodel/instance.go b/internal/gtsmodel/instance.go index 5bfe942f7..ca2857b95 100644 --- a/internal/gtsmodel/instance.go +++ b/internal/gtsmodel/instance.go @@ -9,7 +9,7 @@ type Instance struct { // Instance domain eg example.org Domain string `bun:",pk,notnull,unique"` // Title of this instance as it would like to be displayed. - Title string + Title string `bun:",nullzero"` // base URI of this instance eg https://example.org URI string `bun:",notnull,unique"` // When was this instance created in the db? @@ -22,20 +22,20 @@ type Instance struct { DomainBlockID string `bun:"type:CHAR(26),nullzero"` DomainBlock *DomainBlock `bun:"rel:belongs-to"` // Short description of this instance - ShortDescription string + ShortDescription string `bun:",nullzero"` // Longer description of this instance - Description string + Description string `bun:",nullzero"` // Terms and conditions of this instance - Terms string + Terms string `bun:",nullzero"` // Contact email address for this instance - ContactEmail string + ContactEmail string `bun:",nullzero"` // Username of the contact account for this instance - ContactAccountUsername string + ContactAccountUsername string `bun:",nullzero"` // Contact account ID in the database for this instance ContactAccountID string `bun:"type:CHAR(26),nullzero"` ContactAccount *Account `bun:"rel:belongs-to"` // Reputation score of this instance Reputation int64 `bun:",notnull,default:0"` // Version of the software used on this instance - Version string + Version string `bun:",nullzero"` } diff --git a/internal/gtsmodel/mediaattachment.go b/internal/gtsmodel/mediaattachment.go index b767e538c..2acf6a6fc 100644 --- a/internal/gtsmodel/mediaattachment.go +++ b/internal/gtsmodel/mediaattachment.go @@ -30,9 +30,9 @@ type MediaAttachment struct { // ID of the status to which this is attached StatusID string `bun:"type:CHAR(26),nullzero"` // Where can the attachment be retrieved on *this* server - URL string + URL string `bun:",nullzero"` // Where can the attachment be retrieved on a remote server (empty for local media) - RemoteURL string + RemoteURL string `bun:",nullzero"` // When was the attachment created CreatedAt time.Time `bun:",nullzero,notnull,default:current_timestamp"` // When was the attachment last updated @@ -45,11 +45,11 @@ type MediaAttachment struct { AccountID string `bun:"type:CHAR(26),notnull"` Account *Account `bun:"rel:has-one"` // Description of the attachment (for screenreaders) - Description string + Description string `bun:",nullzero"` // To which scheduled status does this attachment belong ScheduledStatusID string `bun:"type:CHAR(26),nullzero"` // What is the generated blurhash of this attachment - Blurhash string + Blurhash string `bun:",nullzero"` // What is the processing status of this attachment Processing ProcessingStatus // metadata for the whole file @@ -65,29 +65,29 @@ type MediaAttachment struct { // File refers to the metadata for the whole file type File struct { // What is the path of the file in storage. - Path string + Path string `bun:",nullzero"` // What is the MIME content type of the file. - ContentType string + ContentType string `bun:",nullzero"` // What is the size of the file in bytes. FileSize int // When was the file last updated. - UpdatedAt time.Time `bun:"type:timestamp,notnull,default:current_timestamp"` + UpdatedAt time.Time `bun:",notnull,default:current_timestamp"` } // Thumbnail refers to a small image thumbnail derived from a larger image, video, or audio file. type Thumbnail struct { // What is the path of the file in storage - Path string + Path string `bun:",nullzero"` // What is the MIME content type of the file. - ContentType string + ContentType string `bun:",nullzero"` // What is the size of the file in bytes FileSize int // When was the file last updated - UpdatedAt time.Time `bun:"type:timestamp,notnull,default:current_timestamp"` + UpdatedAt time.Time `bun:",notnull,default:current_timestamp"` // What is the URL of the thumbnail on the local server - URL string + URL string `bun:",nullzero"` // What is the remote URL of the thumbnail (empty for local media) - RemoteURL string + RemoteURL string `bun:",nullzero"` } // ProcessingStatus refers to how far along in the processing stage the attachment is. diff --git a/internal/gtsmodel/status.go b/internal/gtsmodel/status.go index fd33bd788..1997ad5df 100644 --- a/internal/gtsmodel/status.go +++ b/internal/gtsmodel/status.go @@ -31,7 +31,7 @@ type Status struct { // web url for viewing this status URL string `bun:",unique,nullzero"` // the html-formatted content of this status - Content string + Content string `bun:",nullzero"` // Database IDs of any media attachments associated with this status AttachmentIDs []string `bun:"attachments,array"` Attachments []*MediaAttachment `bun:"attached_media,rel:has-many"` @@ -54,12 +54,12 @@ type Status struct { AccountID string `bun:"type:CHAR(26),notnull"` Account *Account `bun:"rel:belongs-to"` // AP uri of the owner of this status - AccountURI string + AccountURI string `bun:",nullzero"` // id of the status this status is a reply to InReplyToID string `bun:"type:CHAR(26),nullzero"` InReplyTo *Status `bun:"-"` // AP uri of the status this status is a reply to - InReplyToURI string + InReplyToURI string `bun:",nullzero"` // id of the account that this status replies to InReplyToAccountID string `bun:"type:CHAR(26),nullzero"` InReplyToAccount *Account `bun:"rel:belongs-to"` @@ -70,13 +70,13 @@ type Status struct { BoostOfAccountID string `bun:"type:CHAR(26),nullzero"` BoostOfAccount *Account `bun:"rel:belongs-to"` // cw string for this status - ContentWarning string + ContentWarning string `bun:",nullzero"` // visibility entry for this status Visibility Visibility `bun:",notnull"` // mark the status as sensitive? Sensitive bool // what language is this status written in? - Language string + Language string `bun:",nullzero"` // Which application was used to create this status? CreatedWithApplicationID string `bun:"type:CHAR(26),nullzero"` CreatedWithApplication *Application `bun:"rel:belongs-to"` @@ -84,9 +84,9 @@ type Status struct { VisibilityAdvanced *VisibilityAdvanced // What is the activitystreams type of this status? See: https://www.w3.org/TR/activitystreams-vocabulary/#object-types // Will probably almost always be Note but who knows!. - ActivityStreamsType string + ActivityStreamsType string `bun:",nullzero"` // Original text of the status without formatting - Text string + Text string `bun:",nullzero"` // Has this status been pinned by its owner? Pinned bool } diff --git a/internal/gtsmodel/tag.go b/internal/gtsmodel/tag.go index 5006a36f4..d4be0b66c 100644 --- a/internal/gtsmodel/tag.go +++ b/internal/gtsmodel/tag.go @@ -25,7 +25,7 @@ type Tag struct { // id of this tag in the database ID string `bun:",unique,type:CHAR(26),pk,notnull"` // Href of this tag, eg https://example.org/tags/somehashtag - URL string + URL string `bun:",nullzero"` // name of this tag -- the tag without the hash part Name string `bun:",unique,notnull"` // Which account ID is the first one we saw using this tag? diff --git a/internal/gtsmodel/user.go b/internal/gtsmodel/user.go index f439be439..c36d75c8c 100644 --- a/internal/gtsmodel/user.go +++ b/internal/gtsmodel/user.go @@ -67,7 +67,7 @@ type User struct { // What languages does this user not want to see? FilteredLanguages []string // In what timezone/locale is this user located? - Locale string + Locale string `bun:",nullzero"` // Which application id created this user? See gtsmodel.Application CreatedByApplicationID string `bun:"type:CHAR(26),nullzero"` CreatedByApplication *Application `bun:"rel:belongs-to"` @@ -79,13 +79,13 @@ type User struct { */ // What confirmation token did we send this user/what are we expecting back? - ConfirmationToken string + ConfirmationToken string `bun:",nullzero"` // When did the user confirm their email address ConfirmedAt time.Time `bun:",nullzero"` // When did we send email confirmation to this user? ConfirmationSentAt time.Time `bun:",nullzero"` // Email address that hasn't yet been confirmed - UnconfirmedEmail string + UnconfirmedEmail string `bun:",nullzero"` /* ACL FLAGS @@ -105,18 +105,18 @@ type User struct { */ // The generated token that the user can use to reset their password - ResetPasswordToken string + ResetPasswordToken string `bun:",nullzero"` // When did we email the user their reset-password email? ResetPasswordSentAt time.Time `bun:",nullzero"` - EncryptedOTPSecret string - EncryptedOTPSecretIv string - EncryptedOTPSecretSalt string + EncryptedOTPSecret string `bun:",nullzero"` + EncryptedOTPSecretIv string `bun:",nullzero"` + EncryptedOTPSecretSalt string `bun:",nullzero"` OTPRequiredForLogin bool OTPBackupCodes []string ConsumedTimestamp int - RememberToken string - SignInToken string + RememberToken string `bun:",nullzero"` + SignInToken string `bun:",nullzero"` SignInTokenSentAt time.Time `bun:",nullzero"` - WebauthnID string + WebauthnID string `bun:",nullzero"` } |