fix

Author: mattyatea

packages/backend/src/core/SystemWebhookService.ts

@@ -44,9 +44,10 @@ export type InactiveModeratorsWarningPayload = {
 export type SystemWebhookPayload<T extends SystemWebhookEventType> =
 	T extends 'abuseReport' | 'abuseReportResolved' ? AbuseReportPayload :
 	T extends 'userCreated' ? Packed<'UserLite'> :
+	T extends 'userRegistered' ? { username: string, email: string | null, host: string | null } :
 	T extends 'inactiveModeratorsWarning' ? InactiveModeratorsWarningPayload :
 	T extends 'inactiveModeratorsInvitationOnlyChanged' ? Record<string, never> :
-		never;
+	never;
 
 @Injectable()
 export class SystemWebhookService implements OnApplicationShutdown {

packages/backend/src/core/activitypub/ApInboxService.ts

@@ -819,16 +819,15 @@ export class ApInboxService {
 		if (isActor(object)) {
 			await this.apPersonService.updatePerson(actor.uri, resolver, object);
 			return 'ok: Person updated';
-			// eslint-disable-next-line brace-style
-		} /*else if (getApType(object) === 'Question') {
-			await this.apQuestionService.updateQuestion(object, actor, resolver).catch(err => console.error(err));
-			return 'ok: Question updated';
-		}*/ else if (getApType(object) === 'Note' || getApType(object) === 'Question') {
+		} else if (getApType(object) === 'Note' || getApType(object) === 'Question') {
 			await this.updateNote(resolver, actor, object, false, activity);
 			return 'ok: Note updated';
 		} else {
 			return `skip: Unknown type: ${getApType(object)}`;
-		}
+		} /*else if (getApType(object) === 'Question') {
+			await this.apQuestionService.updateQuestion(object, actor, resolver).catch(err => console.error(err));
+			return 'ok: Question updated';
+		}*/
 	}
 
 	@bindThis

packages/backend/src/core/entities/UserEntityService.ts

@@ -491,7 +491,7 @@ export class UserEntityService implements OnModuleInit {
 			isBot: user.isBot,
 			isCat: user.isCat,
 			makeNotesFollowersOnlyBefore: (user.host && user.makeNotesFollowersOnlyBefore) ?? undefined,
-			makeNotesHiddenBefore: (user.host && user.makeNotesHiddenBefore )?? undefined,
+			makeNotesHiddenBefore: (user.host && user.makeNotesHiddenBefore ) ?? undefined,
 			instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
 				name: instance.name,
 				softwareName: instance.softwareName,

packages/backend/src/misc/json-schema.ts

@@ -33,7 +33,7 @@ import { packedClipSchema } from '@/models/json-schema/clip.js';
 import { packedFederationInstanceSchema } from '@/models/json-schema/federation-instance.js';
 import { packedQueueCountSchema } from '@/models/json-schema/queue.js';
 import { packedGalleryPostSchema } from '@/models/json-schema/gallery-post.js';
-import { packedEmojiDetailedSchema, packedEmojiRequestSimpleSchema, packedEmojiSimpleSchema, packedEmojiRequestDetailedSchema,packedEmojiDetailedAdminSchema } from '@/models/json-schema/emoji.js';
+import { packedEmojiDetailedSchema, packedEmojiRequestSimpleSchema, packedEmojiSimpleSchema, packedEmojiRequestDetailedSchema, packedEmojiDetailedAdminSchema } from '@/models/json-schema/emoji.js';
 import { packedFlashSchema } from '@/models/json-schema/flash.js';
 import { packedAnnouncementSchema } from '@/models/json-schema/announcement.js';
 import { packedSigninSchema } from '@/models/json-schema/signin.js';

packages/backend/src/models/InboxRule.ts

@@ -152,28 +152,28 @@ type CondFormulaValueServerIsSilenced = {
 };
 
 type CondFormulaValueServerPubLessThanOrEq = {
-	type : 'serverPubLessThanOrEq'
+	type: 'serverPubLessThanOrEq'
 	value: number;
-}
+};
 
 type CondFormulaValueServerPubMoreThanOrEq = {
-	type : 'serverPubMoreThanOrEq'
+	type: 'serverPubMoreThanOrEq'
 	value: number;
-}
+};
 
 type CondFormulaValueServerSubLessThanOrEq = {
-	type : 'serverSubLessThanOrEq'
+	type: 'serverSubLessThanOrEq'
 	value: number;
-}
+};
 
 type CondFormulaValueServerSubMoreThanOrEq = {
-	type : 'serverSubMoreThanOrEq'
+	type: 'serverSubMoreThanOrEq'
 	value: number;
-}
+};
 
 type CondFormulaThisActivityIsNote = {
-	type : 'thisActivityIsNote'
-}
+	type: 'thisActivityIsNote'
+};
 
 export type InboxRuleCondFormulaValue = { id: string } & (
 	CondFormulaValueAnd |
@@ -207,7 +207,7 @@ export type InboxRuleCondFormulaValue = { id: string } & (
 export type InboxRuleAction = {
 	type: 'reject' | 'messageRewrite';
 	rewrite?: string | null | undefined;
-}
+};
 
 import { PrimaryColumn, Entity, Column } from 'typeorm';
 import { id } from './util/id.js';

packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts

@@ -36,7 +36,7 @@ export class SystemWebhookDeliverProcessorService {
 	public async process(job: Bull.Job<SystemWebhookDeliverJobData>): Promise<string> {
 		try {
 			this.logger.debug(`delivering ${job.data.webhookId}`);
-			this.logger.debug(				JSON.stringify({
+			this.logger.debug(JSON.stringify({
 				server: this.config.url,
 				hookId: job.data.webhookId,
 				eventId: job.data.eventId,

packages/backend/src/queue/types.ts

@@ -114,8 +114,8 @@ export type EndedPollNotificationJobData = {
 };
 
 export type ScheduleNotePostJobData = {
-  scheduledNoteId: MiNote['id'];
-}
+	scheduledNoteId: MiNote['id'];
+};
 
 type MinimumUser = {
 	id: MiUser['id'];

packages/backend/src/server/ActivityPubServerService.ts

@@ -751,7 +751,7 @@ export class ActivityPubServerService {
 		});
 
 		// follow
-		fastify.get<{ Params: { followRequestId: string ; } }>('/follows/:followRequestId', async (request, reply) => {
+		fastify.get<{ Params: { followRequestId: string; } }>('/follows/:followRequestId', async (request, reply) => {
 			// This may be used before the follow is completed, so we do not
 			// check if the following exists and only check if the follow request exists.
 

packages/backend/src/server/FileServerService.ts

@@ -519,7 +519,7 @@ export class FileServerService {
 
 	@bindThis
 	private async downloadAndDetectTypeFromUrl(url: string): Promise<
-		{ state: 'remote' ; mime: string; ext: string | null; path: string; cleanup: () => void; filename: string; }
+		{ state: 'remote'; mime: string; ext: string | null; path: string; cleanup: () => void; filename: string; }
 	> {
 		const [path, cleanup] = await createTemp();
 		try {

packages/backend/src/server/api/SignupApiService.ts

@@ -6,9 +6,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import bcrypt from 'bcryptjs';
 import { IsNull } from 'typeorm';
-import ProxyCheck from 'proxycheck-ts';
 import { DI } from '@/di-symbols.js';
-import type { RegistrationTicketsRepository, UsedUsernamesRepository, UserPendingsRepository, UserProfilesRepository, UsersRepository, MiRegistrationTicket, MiMeta ,SystemWebhooksRepository,} from '@/models/_.js';
+import type { RegistrationTicketsRepository, UsedUsernamesRepository, UserPendingsRepository, UserProfilesRepository, UsersRepository, MiRegistrationTicket, MiMeta, SystemWebhooksRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import { CaptchaService } from '@/core/CaptchaService.js';
 import { IdService } from '@/core/IdService.js';
@@ -125,7 +124,6 @@ export class SignupApiService {
 			.andWhere('webhook.on @> :eventName', { eventName: '{userRegistered}' })
 			.getMany();
 		activeSystemWebhooksWithUserRegistered.forEach(it => this.systemWebhookService.enqueueSystemWebhook(
-			it.id,
 			'userRegistered',
 			{
 				username,