diff options
Diffstat (limited to 'internal/processing')
| -rw-r--r-- | internal/processing/notification.go | 64 | ||||
| -rw-r--r-- | internal/processing/notification_test.go | 4 |
2 files changed, 51 insertions, 17 deletions
diff --git a/internal/processing/notification.go b/internal/processing/notification.go index 1cfe71b28..2e4e1788f 100644 --- a/internal/processing/notification.go +++ b/internal/processing/notification.go @@ -31,34 +31,69 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/util" ) -func (p *Processor) NotificationsGet(ctx context.Context, authed *oauth.Auth, excludeTypes []string, limit int, maxID string, sinceID string) (*apimodel.PageableResponse, gtserror.WithCode) { - notifs, err := p.state.DB.GetAccountNotifications(ctx, authed.Account.ID, excludeTypes, limit, maxID, sinceID) +func (p *Processor) NotificationsGet(ctx context.Context, authed *oauth.Auth, maxID string, sinceID string, minID string, limit int, excludeTypes []string) (*apimodel.PageableResponse, gtserror.WithCode) { + notifs, err := p.state.DB.GetAccountNotifications(ctx, authed.Account.ID, maxID, sinceID, minID, limit, excludeTypes) if err != nil { + if errors.Is(err, db.ErrNoEntries) { + // No notifs (left). + return util.EmptyPageableResponse(), nil + } + // An actual error has occurred. + err = fmt.Errorf("NotificationsGet: db error getting notifications: %w", err) return nil, gtserror.NewErrorInternalError(err) } count := len(notifs) - if count == 0 { return util.EmptyPageableResponse(), nil } - items := make([]interface{}, 0, count) - nextMaxIDValue := "" - prevMinIDValue := "" - for i, n := range notifs { - item, err := p.tc.NotificationToAPINotification(ctx, n) - if err != nil { - log.Debugf(ctx, "got an error converting a notification to api, will skip it: %s", err) - continue - } + var ( + items = make([]interface{}, 0, count) + nextMaxIDValue string + prevMinIDValue string + ) + for i, n := range notifs { + // Set next + prev values before filtering and API + // converting, so caller can still page properly. if i == count-1 { - nextMaxIDValue = item.GetID() + nextMaxIDValue = n.ID } if i == 0 { - prevMinIDValue = item.GetID() + prevMinIDValue = n.ID + } + + // Ensure this notification should be shown to requester. + if n.OriginAccount != nil { + // Account is set, ensure it's visible to notif target. + visible, err := p.filter.AccountVisible(ctx, authed.Account, n.OriginAccount) + if err != nil { + log.Debugf(ctx, "skipping notification %s because of an error checking notification visibility: %s", n.ID, err) + continue + } + if !visible { + continue + } + } + + if n.Status != nil { + // Status is set, ensure it's visible to notif target. + visible, err := p.filter.StatusVisible(ctx, authed.Account, n.Status) + if err != nil { + log.Debugf(ctx, "skipping notification %s because of an error checking notification visibility: %s", n.ID, err) + continue + } + if !visible { + continue + } + } + + item, err := p.tc.NotificationToAPINotification(ctx, n) + if err != nil { + log.Debugf(ctx, "skipping notification %s because it couldn't be converted to its api representation: %s", n.ID, err) + continue } items = append(items, item) @@ -68,7 +103,6 @@ func (p *Processor) NotificationsGet(ctx context.Context, authed *oauth.Auth, ex Items: items, Path: "api/v1/notifications", NextMaxIDValue: nextMaxIDValue, - PrevMinIDKey: "since_id", PrevMinIDValue: prevMinIDValue, Limit: limit, }) diff --git a/internal/processing/notification_test.go b/internal/processing/notification_test.go index 054f52157..bf69fc9bc 100644 --- a/internal/processing/notification_test.go +++ b/internal/processing/notification_test.go @@ -32,7 +32,7 @@ type NotificationTestSuite struct { // get a notification where someone has liked our status func (suite *NotificationTestSuite) TestGetNotifications() { receivingAccount := suite.testAccounts["local_account_1"] - notifsResponse, err := suite.processor.NotificationsGet(context.Background(), suite.testAutheds["local_account_1"], []string{}, 10, "", "") + notifsResponse, err := suite.processor.NotificationsGet(context.Background(), suite.testAutheds["local_account_1"], "", "", "", 10, nil) suite.NoError(err) suite.Len(notifsResponse.Items, 1) notif, ok := notifsResponse.Items[0].(*apimodel.Notification) @@ -44,7 +44,7 @@ func (suite *NotificationTestSuite) TestGetNotifications() { suite.NotNil(notif.Status) suite.NotNil(notif.Status.Account) suite.Equal(receivingAccount.ID, notif.Status.Account.ID) - suite.Equal(`<http://localhost:8080/api/v1/notifications?limit=10&max_id=01F8Q0ANPTWW10DAKTX7BRPBJP>; rel="next", <http://localhost:8080/api/v1/notifications?limit=10&since_id=01F8Q0ANPTWW10DAKTX7BRPBJP>; rel="prev"`, notifsResponse.LinkHeader) + suite.Equal(`<http://localhost:8080/api/v1/notifications?limit=10&max_id=01F8Q0ANPTWW10DAKTX7BRPBJP>; rel="next", <http://localhost:8080/api/v1/notifications?limit=10&min_id=01F8Q0ANPTWW10DAKTX7BRPBJP>; rel="prev"`, notifsResponse.LinkHeader) } func TestNotificationTestSuite(t *testing.T) { |