summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-09 11:02:37 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-02-09 11:02:37 +0900
commit5facd11592dbd2bb789aeaa9082ca8edd35f373a (patch)
tree657675119923ae99637684e4dbf41765acbd58b9 /packages/backend/src
parentrefactor: fix types (diff)
downloadsharkey-5facd11592dbd2bb789aeaa9082ca8edd35f373a.tar.gz
sharkey-5facd11592dbd2bb789aeaa9082ca8edd35f373a.tar.bz2
sharkey-5facd11592dbd2bb789aeaa9082ca8edd35f373a.zip
refactor: fix types
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/core/QueryService.ts6
-rw-r--r--packages/backend/src/misc/gen-identicon.ts2
-rw-r--r--packages/backend/src/server/ActivityPubServerService.ts1
-rw-r--r--packages/backend/src/server/api/SignupApiService.ts1
-rw-r--r--packages/backend/src/server/web/ClientServerService.ts3
5 files changed, 9 insertions, 4 deletions
diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 4cc844ccea..c334d749e6 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -1,10 +1,10 @@
import { Inject, Injectable } from '@nestjs/common';
-import { Brackets } from 'typeorm';
+import { Brackets, ObjectLiteral } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { User } from '@/models/entities/User.js';
import type { UserProfilesRepository, FollowingsRepository, ChannelFollowingsRepository, MutedNotesRepository, BlockingsRepository, NoteThreadMutingsRepository, MutingsRepository } from '@/models/index.js';
-import type { SelectQueryBuilder } from 'typeorm';
import { bindThis } from '@/decorators.js';
+import type { SelectQueryBuilder } from 'typeorm';
@Injectable()
export class QueryService {
@@ -32,7 +32,7 @@ export class QueryService {
) {
}
- public makePaginationQuery<T>(q: SelectQueryBuilder<T>, sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number): SelectQueryBuilder<T> {
+ public makePaginationQuery<T extends ObjectLiteral>(q: SelectQueryBuilder<T>, sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number): SelectQueryBuilder<T> {
if (sinceId && untilId) {
q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: sinceId });
q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
diff --git a/packages/backend/src/misc/gen-identicon.ts b/packages/backend/src/misc/gen-identicon.ts
index 4a70d7a4bb..b40745973e 100644
--- a/packages/backend/src/misc/gen-identicon.ts
+++ b/packages/backend/src/misc/gen-identicon.ts
@@ -51,7 +51,7 @@ export function genIdenticon(seed: string, stream: WriteStream): Promise<void> {
bg.addColorStop(0, bgColors[0]);
bg.addColorStop(1, bgColors[1]);
- ctx.fillStyle = bg;
+ ctx.fillStyle = bg as any;
ctx.beginPath();
ctx.fillRect(0, 0, size, size);
diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index 632a2ccb2e..186d3822d8 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -540,6 +540,7 @@ export class ActivityPubServerService {
return (this.apRendererService.renderActivity(this.apRendererService.renderKey(user, keypair)));
} else {
reply.code(400);
+ return;
}
});
diff --git a/packages/backend/src/server/api/SignupApiService.ts b/packages/backend/src/server/api/SignupApiService.ts
index c46f71d934..ffd7e203ea 100644
--- a/packages/backend/src/server/api/SignupApiService.ts
+++ b/packages/backend/src/server/api/SignupApiService.ts
@@ -146,6 +146,7 @@ export class SignupApiService {
`To complete signup, please click this link: ${link}`);
reply.code(204);
+ return;
} else {
try {
const { account, secret } = await this.signupService.signup({
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index 044cba8d1e..1fa8950d75 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -372,6 +372,7 @@ export class ClientServerService {
return feed.atom1();
} else {
reply.code(404);
+ return;
}
});
@@ -384,6 +385,7 @@ export class ClientServerService {
return feed.rss2();
} else {
reply.code(404);
+ return;
}
});
@@ -396,6 +398,7 @@ export class ClientServerService {
return feed.json1();
} else {
reply.code(404);
+ return;
}
});