summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:43 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:43 -0400
commitea2a3be70f87cc8b953c37ffe82633be3ad4978c (patch)
treed8255e09eaebbaf5080775114fa11da811f3bcb2 /packages/backend/src/server/api/endpoints
parentMerge branch 'misskey-develop' into merge/2025-03-24 (diff)
parentmerge: More Mastodon API fixes (resolves #405, #471, and #984) (!954) (diff)
downloadsharkey-ea2a3be70f87cc8b953c37ffe82633be3ad4978c.tar.gz
sharkey-ea2a3be70f87cc8b953c37ffe82633be3ad4978c.tar.bz2
sharkey-ea2a3be70f87cc8b953c37ffe82633be3ad4978c.zip
Merge branch 'develop' into merge/2025-03-24
# Conflicts: # packages/backend/src/core/activitypub/models/ApPersonService.ts
Diffstat (limited to 'packages/backend/src/server/api/endpoints')
-rw-r--r--packages/backend/src/server/api/endpoints/i/notifications.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts
index be8d0cfb34..076118d8d9 100644
--- a/packages/backend/src/server/api/endpoints/i/notifications.ts
+++ b/packages/backend/src/server/api/endpoints/i/notifications.ts
@@ -82,8 +82,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
const includeTypes = ps.includeTypes && ps.includeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
const excludeTypes = ps.excludeTypes && ps.excludeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
- let sinceTime = ps.sinceId ? this.idService.parse(ps.sinceId).date.getTime().toString() : null;
- let untilTime = ps.untilId ? this.idService.parse(ps.untilId).date.getTime().toString() : null;
+ let sinceTime = ps.sinceId ? (this.idService.parse(ps.sinceId).date.getTime() + 1).toString() : null;
+ let untilTime = ps.untilId ? (this.idService.parse(ps.untilId).date.getTime() - 1).toString() : null;
let notifications: MiNotification[];
for (;;) {