diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/db/bundb/notification.go | 3 | ||||
| -rw-r--r-- | internal/db/bundb/notification_test.go | 3 | ||||
| -rw-r--r-- | internal/gtsmodel/notification.go | 10 |
3 files changed, 5 insertions, 11 deletions
diff --git a/internal/db/bundb/notification.go b/internal/db/bundb/notification.go index 1874f81ea..6a8fab464 100644 --- a/internal/db/bundb/notification.go +++ b/internal/db/bundb/notification.go @@ -55,9 +55,6 @@ func (n *notificationDB) GetNotification(ctx context.Context, id string) (*gtsmo q := n.conn.NewSelect(). Model(¬if). - Relation("OriginAccount"). - Relation("TargetAccount"). - Relation("Status"). Where("? = ?", bun.Ident("notification.id"), id) if err := q.Scan(ctx); err != nil { return nil, n.conn.ProcessError(err) diff --git a/internal/db/bundb/notification_test.go b/internal/db/bundb/notification_test.go index 704d3373b..cd5022951 100644 --- a/internal/db/bundb/notification_test.go +++ b/internal/db/bundb/notification_test.go @@ -113,9 +113,6 @@ func (suite *NotificationTestSuite) TestGetNotificationsWithoutSpam() { suite.NotNil(notifications) for _, n := range notifications { suite.Equal(testAccount.ID, n.TargetAccountID) - suite.NotNil(n.OriginAccount) - suite.NotNil(n.TargetAccount) - suite.NotNil(n.Status) } } diff --git a/internal/gtsmodel/notification.go b/internal/gtsmodel/notification.go index d05898615..11792cca5 100644 --- a/internal/gtsmodel/notification.go +++ b/internal/gtsmodel/notification.go @@ -24,14 +24,14 @@ import "time" type Notification struct { ID string `validate:"required,ulid" bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database CreatedAt time.Time `validate:"-" bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item created - UpdatedAt time.Time `validate:"-" bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item last updated // when was item created + UpdatedAt time.Time `validate:"-" bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item last updated NotificationType NotificationType `validate:"oneof=follow follow_request mention reblog favourite poll status" bun:",nullzero,notnull"` // Type of this notification - TargetAccountID string `validate:"ulid" bun:"type:CHAR(26),nullzero,notnull"` // Which account does this notification target (ie., who will receive the notification?) - TargetAccount *Account `validate:"-" bun:"rel:belongs-to"` // Which account performed the action that created this notification? + TargetAccountID string `validate:"ulid" bun:"type:CHAR(26),nullzero,notnull"` // ID of the account targeted by the notification (ie., who will receive the notification?) + TargetAccount *Account `validate:"-" bun:"-"` // Account corresponding to TargetAccountID. Can be nil, always check first + select using ID if necessary. OriginAccountID string `validate:"ulid" bun:"type:CHAR(26),nullzero,notnull"` // ID of the account that performed the action that created the notification. - OriginAccount *Account `validate:"-" bun:"rel:belongs-to"` // Account corresponding to originAccountID + OriginAccount *Account `validate:"-" bun:"-"` // Account corresponding to OriginAccountID. Can be nil, always check first + select using ID if necessary. 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:"-"` // Status corresponding to StatusID. Can be nil, always check first + select using ID if necessary. Read *bool `validate:"-" bun:",nullzero,notnull,default:false"` // Notification has been seen/read } |