diff options
| author | Marie <github@yuugi.dev> | 2025-02-18 23:25:54 +0000 |
|---|---|---|
| committer | Marie <github@yuugi.dev> | 2025-02-18 23:25:54 +0000 |
| commit | 0bec7fe2a2dab48aea1e2e266d619adb5d110638 (patch) | |
| tree | 7ace901cda18772a7df76cefe999f63cc00eb8aa | |
| parent | merge: Optionally log remote ActivityPub objects to database (!833) (diff) | |
| parent | fix names that annoy @dakkar (diff) | |
| download | sharkey-0bec7fe2a2dab48aea1e2e266d619adb5d110638.tar.gz sharkey-0bec7fe2a2dab48aea1e2e266d619adb5d110638.tar.bz2 sharkey-0bec7fe2a2dab48aea1e2e266d619adb5d110638.zip | |
merge: fix time zone for CustomEmojiService test (!909)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/909
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
| -rw-r--r-- | packages/backend/src/core/CustomEmojiService.ts | 4 | ||||
| -rw-r--r-- | packages/backend/test/unit/CustomEmojiService.ts | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index 165d58d1b2..2e4eddf797 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -520,11 +520,11 @@ export class CustomEmojiService implements OnApplicationShutdown { const q = params.query; if (q.updatedAtFrom) { // noIndexScan - builder.andWhere('CAST(emoji.updatedAt AS DATE) >= :updateAtFrom', { updateAtFrom: q.updatedAtFrom }); + builder.andWhere('CAST(emoji.updatedAt AS DATE) >= :updatedAtFrom', { updatedAtFrom: q.updatedAtFrom }); } if (q.updatedAtTo) { // noIndexScan - builder.andWhere('CAST(emoji.updatedAt AS DATE) <= :updateAtTo', { updateAtTo: q.updatedAtTo }); + builder.andWhere('CAST(emoji.updatedAt AS DATE) <= :updatedAtTo', { updatedAtTo: q.updatedAtTo }); } if (q.name) { builder.andWhere('emoji.name ~~ ANY(ARRAY[:...name])', { name: multipleWordsToQuery(q.name) }); diff --git a/packages/backend/test/unit/CustomEmojiService.ts b/packages/backend/test/unit/CustomEmojiService.ts index ffd96356e0..8c3dac69e8 100644 --- a/packages/backend/test/unit/CustomEmojiService.ts +++ b/packages/backend/test/unit/CustomEmojiService.ts @@ -17,6 +17,7 @@ import { EmojisRepository } from '@/models/_.js'; import { MiEmoji } from '@/models/Emoji.js'; import { CoreModule } from '@/core/CoreModule.js'; import { DriveService } from '@/core//DriveService.js'; +import { DataSource } from 'typeorm'; describe('CustomEmojiService', () => { let app: TestingModule; @@ -48,6 +49,7 @@ describe('CustomEmojiService', () => { service = app.get<CustomEmojiService>(CustomEmojiService); emojisRepository = app.get<EmojisRepository>(DI.emojisRepository); idService = app.get<IdService>(IdService); + await app.get<DataSource>(DI.db).query("set session time zone 'UTC'"); }); describe('fetchEmojis', () => { |