diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts index f5e53adcdd..4e71f20445 100644 --- a/packages/backend/src/misc/cache.ts +++ b/packages/backend/src/misc/cache.ts @@ -150,7 +150,7 @@ export class RedisSingleCache { const cached = await this.redisClient.get(`singlecache:${this.name}`); if (cached == null) return undefined; const parsed = this.fromRedisConverter(cached); - if (parsed == null) return undefined; + if (parsed == null) return undefined; this.memoryCache.set(parsed); return parsed; } diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts index 24049d7398..83e9e0f783 100644 --- a/packages/backend/src/server/api/endpoints/messaging/history.ts +++ b/packages/backend/src/server/api/endpoints/messaging/history.ts @@ -82,9 +82,10 @@ export default class extends Endpoint { // eslint- query.andWhere('message.groupId NOT IN (:...found)', { found: found }); } } else { - query.where(new Brackets(qb => { qb - .where('message.userId = :userId', { userId: me.id }) - .orWhere('message.recipientId = :userId', { userId: me.id }); + query.where(new Brackets(qb => { + qb + .where('message.userId = :userId', { userId: me.id }) + .orWhere('message.recipientId = :userId', { userId: me.id }); })); query.andWhere('message.groupId IS NULL'); diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts index e6db40b210..718cd65d23 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts @@ -96,15 +96,18 @@ export default class extends Endpoint { // eslint- }); const query = this.queryService.makePaginationQuery(this.messagingMessagesRepository.createQueryBuilder('message'), ps.sinceId, ps.untilId) - .andWhere(new Brackets(qb => { qb - .where(new Brackets(qb => { qb - .where('message.userId = :meId') - .andWhere('message.recipientId = :recipientId'); - })) - .orWhere(new Brackets(qb => { qb - .where('message.userId = :recipientId') - .andWhere('message.recipientId = :meId'); - })); + .andWhere(new Brackets(qb => { + qb + .where(new Brackets(qb => { + qb + .where('message.userId = :meId') + .andWhere('message.recipientId = :recipientId'); + })) + .orWhere(new Brackets(qb => { + qb + .where('message.userId = :recipientId') + .andWhere('message.recipientId = :meId'); + })); })) .setParameter('meId', me.id) .setParameter('recipientId', recipient.id); diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts index 44885bad07..77a6a29f1d 100644 --- a/packages/backend/src/server/api/endpoints/notes/translate.ts +++ b/packages/backend/src/server/api/endpoints/notes/translate.ts @@ -116,8 +116,9 @@ export default class extends Endpoint { // eslint- translator: translatorServices, }; } else if (instance.translatorType === 'ctav3') { - if (instance.ctav3SaKey == null) { return 204; } else if (instance.ctav3ProjectId == null) { return 204; } - else if (instance.ctav3Location == null) { return 204; } + if (instance.ctav3SaKey == null) return 204; + else if (instance.ctav3ProjectId == null) return 204; + else if (instance.ctav3Location == null) return 204; translationResult = await this.apiCloudTranslationAdvanced( (note.cw ? note.cw + '\n' : '') + note.text, targetLang, instance.ctav3SaKey, instance.ctav3ProjectId, instance.ctav3Location, instance.ctav3Model, instance.ctav3Glossary, instance.translatorType, ); diff --git a/packages/backend/src/server/api/endpoints/users/translate.ts b/packages/backend/src/server/api/endpoints/users/translate.ts index 5440b6a561..d9cfaa4fc1 100644 --- a/packages/backend/src/server/api/endpoints/users/translate.ts +++ b/packages/backend/src/server/api/endpoints/users/translate.ts @@ -110,8 +110,9 @@ export default class extends Endpoint { // eslint- translator: translatorServices, }; } else if (instance.translatorType === 'ctav3') { - if (instance.ctav3SaKey == null) { return 204; } else if (instance.ctav3ProjectId == null) { return 204; } - else if (instance.ctav3Location == null) { return 204; } + if (instance.ctav3SaKey == null) return 204; + else if (instance.ctav3ProjectId == null) return 204; + else if (instance.ctav3Location == null) return 204; translationResult = await this.apiCloudTranslationAdvanced( target.description, targetLang, instance.ctav3SaKey, instance.ctav3ProjectId, instance.ctav3Location, instance.ctav3Model, instance.ctav3Glossary, instance.translatorType, ); diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts index 9b9e2e06a4..57d249e3b4 100644 --- a/packages/backend/test/unit/FetchInstanceMetadataService.ts +++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts @@ -55,7 +55,8 @@ describe('FetchInstanceMetadataService', () => { return { fetch: jest.fn() }; } else if (token === DI.redis) { return mockRedis; - }}) + } + }) .compile(); app.enableShutdownHooks(); diff --git a/packages/frontend/src/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue index 11b039bf34..3a0a000686 100644 --- a/packages/frontend/src/components/MkButton.vue +++ b/packages/frontend/src/components/MkButton.vue @@ -35,7 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only