From c8415a5223b794e2152a79eac90ae6e5c324c046 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 7 Oct 2023 02:12:26 +0200 Subject: [PATCH] [mastodon-client] Use ctx.cache for all endpoints --- .../backend/src/server/api/mastodon/endpoints/notifications.ts | 3 +-- packages/backend/src/server/api/mastodon/endpoints/search.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts index af07bfebe..3ff5ca04a 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts @@ -11,10 +11,9 @@ export function setupEndpointsNotifications(router: Router): void { router.get("/v1/notifications", auth(true, ['read:notifications']), async (ctx) => { - const cache = UserHelpers.getFreshAccountCache(); const args = normalizeUrlQuery(convertPaginationArgsIds(limitToInt(ctx.query)), ['types[]', 'exclude_types[]']); const res = await NotificationHelpers.getNotifications(ctx.user, args.max_id, args.since_id, args.min_id, args.limit, args['types[]'], args['exclude_types[]'], args.account_id); - const data = await NotificationConverter.encodeMany(res.data, ctx.user, cache); + const data = await NotificationConverter.encodeMany(res.data, ctx.user, ctx.cache); ctx.body = data.map(n => convertNotificationIds(n)); ctx.pagination = res.pagination; diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts index 4b8d31911..a9df663eb 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/search.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts @@ -10,8 +10,7 @@ export function setupEndpointsSearch(router: Router): void { auth(true, ['read:search']), async (ctx) => { const args = normalizeUrlQuery(convertPaginationArgsIds(argsToBools(limitToInt(ctx.query), ['resolve', 'following', 'exclude_unreviewed']))); - const cache = UserHelpers.getFreshAccountCache(); - const result = await SearchHelpers.search(ctx.user, args.q, args.type, args.resolve, args.following, args.account_id, args['exclude_unreviewed'], args.max_id, args.min_id, args.limit, args.offset, cache); + const result = await SearchHelpers.search(ctx.user, args.q, args.type, args.resolve, args.following, args.account_id, args['exclude_unreviewed'], args.max_id, args.min_id, args.limit, args.offset, ctx.cache); ctx.body = convertSearchIds(result);