diff options
Diffstat (limited to 'internal/db/bundb/notification.go')
-rw-r--r-- | internal/db/bundb/notification.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/internal/db/bundb/notification.go b/internal/db/bundb/notification.go index 35b7e32af..e030cc623 100644 --- a/internal/db/bundb/notification.go +++ b/internal/db/bundb/notification.go @@ -66,9 +66,7 @@ func (n *notificationDB) GetNotifications(ctx context.Context, accountID string, q := n.conn. NewSelect(). Model(¬ifications). - Column("id"). - Where("target_account_id = ?", accountID). - Order("id DESC") + Column("id") if maxID != "" { q = q.Where("id < ?", maxID) @@ -78,6 +76,10 @@ func (n *notificationDB) GetNotifications(ctx context.Context, accountID string, q = q.Where("id > ?", sinceID) } + q = q. + Where("target_account_id = ?", accountID). + Order("id DESC") + if limit != 0 { q = q.Limit(limit) } @@ -120,8 +122,7 @@ func (n *notificationDB) putNotificationCache(notif *gtsmodel.Notification) { } func (n *notificationDB) getNotificationDB(ctx context.Context, id string, dst *gtsmodel.Notification) error { - q := n.newNotificationQ(dst). - Where("notification.id = ?", id) + q := n.newNotificationQ(dst).WherePK() if err := q.Scan(ctx); err != nil { return n.conn.ProcessError(err) |