misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix rebase errors

Browse source
This commit is contained in:
Hazelnoot 2025-11-05 19:51:56 -05:00
parent dcb54c0a8c
commit 83134775f0
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/backend/src/core/NoteCreateService.ts
View file

@ -59,7 +59,6 @@ import { CollapsedQueue } from '@/misc/collapsed-queue.js';
import { CacheService } from '@/core/CacheService.js'; import { CacheService } from '@/core/CacheService.js';
import { TimeService } from '@/global/TimeService.js'; import { TimeService } from '@/global/TimeService.js';
import { NoteVisibilityService } from '@/core/NoteVisibilityService.js'; import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
import { isPureRenote } from '@/misc/is-renote.js';
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention'; type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';

2
packages/backend/test/unit/UserSearchService.ts
View file

@ -143,7 +143,7 @@ describe('UserSearchService', () => {
}); });
afterEach(async () => { afterEach(async () => {
await usersRepository.deleteAll({}); await usersRepository.deleteAll();
cacheManagementService.clear(); cacheManagementService.clear();
}); });

4
packages/backend/test/unit/UserWebhookService.ts
View file

@ -93,8 +93,8 @@ describe('UserWebhookService', () => {
}); });
afterEach(async () => { afterEach(async () => {
await usersRepository.deleteAll({}); await usersRepository.deleteAll();
await userWebhooksRepository.deleteAll({}); await userWebhooksRepository.deleteAll();
queueService.userWebhookDeliver.mockReset(); queueService.userWebhookDeliver.mockReset();
cacheManagementService.clear(); cacheManagementService.clear();
}); });