forked from mirrors/gotosocial
go fmt
This commit is contained in:
tsmethurst
parent
356d28fef9
commit
fffff93b75
4 changed files with 21 additions and 21 deletions
|
|
@ -25,24 +25,24 @@ import (
|
||||||
// MediaAttachment represents a user-uploaded media attachment: an image/video/audio/gif that is
|
// MediaAttachment represents a user-uploaded media attachment: an image/video/audio/gif that is
|
||||||
// somewhere in storage and that can be retrieved and served by the router.
|
// somewhere in storage and that can be retrieved and served by the router.
|
||||||
type MediaAttachment struct {
|
type MediaAttachment struct {
|
||||||
ID string `validate:"required,ulid" bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database
|
ID string `validate:"required,ulid" bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database
|
||||||
CreatedAt time.Time `validate:"required" bun:",nullzero,notnull,default:current_timestamp"` // when was item created
|
CreatedAt time.Time `validate:"required" bun:",nullzero,notnull,default:current_timestamp"` // when was item created
|
||||||
UpdatedAt time.Time `validate:"required" bun:",nullzero,notnull,default:current_timestamp"` // when was item last updated
|
UpdatedAt time.Time `validate:"required" bun:",nullzero,notnull,default:current_timestamp"` // when was item last updated
|
||||||
StatusID string `validate:"omitempty,ulid" bun:"type:CHAR(26),nullzero"` // ID of the status to which this is attached
|
StatusID string `validate:"omitempty,ulid" bun:"type:CHAR(26),nullzero"` // ID of the status to which this is attached
|
||||||
URL string `validate:"required_without=RemoteURL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on *this* server
|
URL string `validate:"required_without=RemoteURL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on *this* server
|
||||||
RemoteURL string `validate:"required_without=URL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on a remote server (empty for local media)
|
RemoteURL string `validate:"required_without=URL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on a remote server (empty for local media)
|
||||||
Type FileType `validate:"oneof=Image Gif Audio Video Unknown" bun:",notnull"` // Type of file (image/gif/audio/video)
|
Type FileType `validate:"oneof=Image Gif Audio Video Unknown" bun:",notnull"` // Type of file (image/gif/audio/video)
|
||||||
FileMeta FileMeta `validate:"required" bun:",nullzero,notnull"` // Metadata about the file
|
FileMeta FileMeta `validate:"required" bun:",nullzero,notnull"` // Metadata about the file
|
||||||
AccountID string `validate:"required,ulid" bun:"type:CHAR(26),nullzero,notnull"` // To which account does this attachment belong
|
AccountID string `validate:"required,ulid" bun:"type:CHAR(26),nullzero,notnull"` // To which account does this attachment belong
|
||||||
Account *Account `validate:"-" bun:"rel:has-one"` // Account corresponding to accountID
|
Account *Account `validate:"-" bun:"rel:has-one"` // Account corresponding to accountID
|
||||||
Description string `validate:"-" bun:",nullzero"` // Description of the attachment (for screenreaders)
|
Description string `validate:"-" bun:",nullzero"` // Description of the attachment (for screenreaders)
|
||||||
ScheduledStatusID string `validate:"omitempty,ulid" bun:"type:CHAR(26),nullzero"` // To which scheduled status does this attachment belong
|
ScheduledStatusID string `validate:"omitempty,ulid" bun:"type:CHAR(26),nullzero"` // To which scheduled status does this attachment belong
|
||||||
Blurhash string `validate:"required_if=Type Image,required_if=Type Gif,required_if=Type Video" bun:",nullzero"` // What is the generated blurhash of this attachment
|
Blurhash string `validate:"required_if=Type Image,required_if=Type Gif,required_if=Type Video" bun:",nullzero"` // What is the generated blurhash of this attachment
|
||||||
Processing ProcessingStatus `validate:"oneof=0 1 2 666" bun:",notnull,default:2"` // What is the processing status of this attachment
|
Processing ProcessingStatus `validate:"oneof=0 1 2 666" bun:",notnull,default:2"` // What is the processing status of this attachment
|
||||||
File File `validate:"required" bun:",notnull,nullzero"` // metadata for the whole file
|
File File `validate:"required" bun:",notnull,nullzero"` // metadata for the whole file
|
||||||
Thumbnail Thumbnail `validate:"required" bun:",notnull,nullzero"` // small image thumbnail derived from a larger image, video, or audio file.
|
Thumbnail Thumbnail `validate:"required" bun:",notnull,nullzero"` // small image thumbnail derived from a larger image, video, or audio file.
|
||||||
Avatar bool `validate:"-" bun:",notnull,default:false"` // Is this attachment being used as an avatar?
|
Avatar bool `validate:"-" bun:",notnull,default:false"` // Is this attachment being used as an avatar?
|
||||||
Header bool `validate:"-" bun:",notnull,default:false"` // Is this attachment being used as a header?
|
Header bool `validate:"-" bun:",notnull,default:false"` // Is this attachment being used as a header?
|
||||||
}
|
}
|
||||||
|
|
||||||
// File refers to the metadata for the whole file
|
// File refers to the metadata for the whole file
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ type Notification struct {
|
||||||
OriginAccount *Account `validate:"-" bun:"rel:belongs-to"` // Account corresponding to originAccountID
|
OriginAccount *Account `validate:"-" bun:"rel:belongs-to"` // Account corresponding to originAccountID
|
||||||
StatusID string `validate:"required_if=NotificationType mention,required_if=NotificationType reblog,required_if=NotificationType favourite,required_if=NotificationType status,omitempty,ulid" bun:"type:CHAR(26),nullzero"` // If the notification pertains to a status, what is the database ID of that status?
|
StatusID string `validate:"required_if=NotificationType mention,required_if=NotificationType reblog,required_if=NotificationType favourite,required_if=NotificationType status,omitempty,ulid" bun:"type:CHAR(26),nullzero"` // If the notification pertains to a status, what is the database ID of that status?
|
||||||
Status *Status `validate:"-" bun:"rel:belongs-to"` // Status corresponding to statusID
|
Status *Status `validate:"-" bun:"rel:belongs-to"` // Status corresponding to statusID
|
||||||
Read bool `validate:"-" bun:",notnull,default:false"` // Notification has been seen/read
|
Read bool `validate:"-" bun:",notnull,default:false"` // Notification has been seen/read
|
||||||
}
|
}
|
||||||
|
|
||||||
// NotificationType describes the reason/type of this notification.
|
// NotificationType describes the reason/type of this notification.
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ func (suite *RouterSessionValidateTestSuite) TestValidateRouterSessionHappyPath(
|
||||||
|
|
||||||
func (suite *RouterSessionValidateTestSuite) TestValidateRouterSessionAuth() {
|
func (suite *RouterSessionValidateTestSuite) TestValidateRouterSessionAuth() {
|
||||||
r := happyRouterSession()
|
r := happyRouterSession()
|
||||||
|
|
||||||
// remove auth struct
|
// remove auth struct
|
||||||
r.Auth = nil
|
r.Auth = nil
|
||||||
err := gtsmodel.ValidateStruct(*r)
|
err := gtsmodel.ValidateStruct(*r)
|
||||||
|
|
@ -65,7 +65,7 @@ func (suite *RouterSessionValidateTestSuite) TestValidateRouterSessionAuth() {
|
||||||
|
|
||||||
func (suite *RouterSessionValidateTestSuite) TestValidateRouterSessionCrypt() {
|
func (suite *RouterSessionValidateTestSuite) TestValidateRouterSessionCrypt() {
|
||||||
r := happyRouterSession()
|
r := happyRouterSession()
|
||||||
|
|
||||||
// remove crypt struct
|
// remove crypt struct
|
||||||
r.Crypt = nil
|
r.Crypt = nil
|
||||||
err := gtsmodel.ValidateStruct(*r)
|
err := gtsmodel.ValidateStruct(*r)
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ var (
|
||||||
followPathRegex = regexp.MustCompile(followPathRegexString)
|
followPathRegex = regexp.MustCompile(followPathRegexString)
|
||||||
|
|
||||||
ulidRegexString = `[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}`
|
ulidRegexString = `[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}`
|
||||||
ulidRegex = regexp.MustCompile(fmt.Sprintf(`^%s$`, ulidRegexString))
|
ulidRegex = regexp.MustCompile(fmt.Sprintf(`^%s$`, ulidRegexString))
|
||||||
|
|
||||||
likedPathRegexString = fmt.Sprintf(`^/?%s/(%s)/%s$`, UsersPath, usernameRegexString, LikedPath)
|
likedPathRegexString = fmt.Sprintf(`^/?%s/(%s)/%s$`, UsersPath, usernameRegexString, LikedPath)
|
||||||
// likedPathRegex parses a path that validates and captures the username part from eg /users/example_username/liked
|
// likedPathRegex parses a path that validates and captures the username part from eg /users/example_username/liked
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue