11 files changed, 42 insertions, 47 deletions

diff --git a/src/remote/activitypub/kernel/accept/index.ts b/src/remote/activitypub/kernel/accept/index.ts
index 572a254d9a..443c1935d6 100644
--- a/src/remote/activitypub/kernel/accept/index.ts
+++ b/src/remote/activitypub/kernel/accept/index.ts
@@ -1,16 +1,15 @@
-import * as debug from 'debug';
-
 import Resolver from '../../resolver';
 import { IRemoteUser } from '../../../../models/user';
 import acceptFollow from './follow';
 import { IAccept, IFollow } from '../../type';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IAccept): Promise<void> => {
 	const uri = activity.id || activity;
 
-	log(`Accept: ${uri}`);
+	logger.info(`Accept: ${uri}`);
 
 	const resolver = new Resolver();
 
@@ -19,7 +18,7 @@ export default async (actor: IRemoteUser, activity: IAccept): Promise<void> => {
 	try {
 		object = await resolver.resolve(activity.object);
 	} catch (e) {
-		log(`Resolution failed: ${e}`);
+		logger.error(`Resolution failed: ${e}`);
 		throw e;
 	}
 
@@ -29,7 +28,7 @@ export default async (actor: IRemoteUser, activity: IAccept): Promise<void> => {
 		break;
 
 	default:
-		console.warn(`Unknown accept type: ${object.type}`);
+		logger.warn(`Unknown accept type: ${object.type}`);
 		break;
 	}
 };
diff --git a/src/remote/activitypub/kernel/announce/index.ts b/src/remote/activitypub/kernel/announce/index.ts
index 612b5dee84..80875b90da 100644
--- a/src/remote/activitypub/kernel/announce/index.ts
+++ b/src/remote/activitypub/kernel/announce/index.ts
@@ -1,16 +1,15 @@
-import * as debug from 'debug';
-
 import Resolver from '../../resolver';
 import { IRemoteUser } from '../../../../models/user';
 import announceNote from './note';
 import { IAnnounce, INote } from '../../type';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> => {
 	const uri = activity.id || activity;
 
-	log(`Announce: ${uri}`);
+	logger.info(`Announce: ${uri}`);
 
 	const resolver = new Resolver();
 
@@ -19,7 +18,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
 	try {
 		object = await resolver.resolve(activity.object);
 	} catch (e) {
-		log(`Resolution failed: ${e}`);
+		logger.error(`Resolution failed: ${e}`);
 		throw e;
 	}
 
@@ -29,7 +28,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
 		break;
 
 	default:
-		console.warn(`Unknown announce type: ${object.type}`);
+		logger.warn(`Unknown announce type: ${object.type}`);
 		break;
 	}
 };
diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts
index 5eaeaf7918..128ca6da81 100644
--- a/src/remote/activitypub/kernel/announce/note.ts
+++ b/src/remote/activitypub/kernel/announce/note.ts
@@ -1,13 +1,12 @@
-import * as debug from 'debug';
-
 import Resolver from '../../resolver';
 import post from '../../../../services/note/create';
 import { IRemoteUser, IUser } from '../../../../models/user';
 import { IAnnounce, INote } from '../../type';
 import { fetchNote, resolveNote } from '../../models/note';
 import { resolvePerson } from '../../models/person';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 /**
  * アナウンスアクティビティを捌きます
@@ -32,7 +31,7 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
 
 	const renote = await resolveNote(note);
 
-	log(`Creating the (Re)Note: ${uri}`);
+	logger.info(`Creating the (Re)Note: ${uri}`);
 
 	//#region Visibility
 	const visibility = getVisibility(activity.to, activity.cc, actor);
diff --git a/src/remote/activitypub/kernel/block/index.ts b/src/remote/activitypub/kernel/block/index.ts
index dec591accf..a10163016c 100644
--- a/src/remote/activitypub/kernel/block/index.ts
+++ b/src/remote/activitypub/kernel/block/index.ts
@@ -1,18 +1,18 @@
 import * as mongo from 'mongodb';
 import User, { IRemoteUser } from '../../../../models/user';
 import config from '../../../../config';
-import * as debug from 'debug';
 import { IBlock } from '../../type';
 import block from '../../../../services/blocking/create';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
 	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
 
 	const uri = activity.id || activity;
 
-	log(`Block: ${uri}`);
+	logger.info(`Block: ${uri}`);
 
 	if (!id.startsWith(config.url + '/')) {
 		return null;
diff --git a/src/remote/activitypub/kernel/create/index.ts b/src/remote/activitypub/kernel/create/index.ts
index e11bcac811..c633d95487 100644
--- a/src/remote/activitypub/kernel/create/index.ts
+++ b/src/remote/activitypub/kernel/create/index.ts
@@ -1,17 +1,16 @@
-import * as debug from 'debug';
-
 import Resolver from '../../resolver';
 import { IRemoteUser } from '../../../../models/user';
 import createNote from './note';
 import createImage from './image';
 import { ICreate } from '../../type';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: ICreate): Promise<void> => {
 	const uri = activity.id || activity;
 
-	log(`Create: ${uri}`);
+	logger.info(`Create: ${uri}`);
 
 	const resolver = new Resolver();
 
@@ -20,7 +19,7 @@ export default async (actor: IRemoteUser, activity: ICreate): Promise<void> => {
 	try {
 		object = await resolver.resolve(activity.object);
 	} catch (e) {
-		log(`Resolution failed: ${e}`);
+		logger.error(`Resolution failed: ${e}`);
 		throw e;
 	}
 
@@ -34,7 +33,7 @@ export default async (actor: IRemoteUser, activity: ICreate): Promise<void> => {
 		break;
 
 	default:
-		console.warn(`Unknown type: ${object.type}`);
+		logger.warn(`Unknown type: ${object.type}`);
 		break;
 	}
 };
diff --git a/src/remote/activitypub/kernel/delete/index.ts b/src/remote/activitypub/kernel/delete/index.ts
index 5d7a23584f..eead34785c 100644
--- a/src/remote/activitypub/kernel/delete/index.ts
+++ b/src/remote/activitypub/kernel/delete/index.ts
@@ -3,6 +3,7 @@ import deleteNote from './note';
 import Note from '../../../../models/note';
 import { IRemoteUser } from '../../../../models/user';
 import { IDelete } from '../../type';
+import { apLogger } from '../../logger';
 
 /**
  * 削除アクティビティを捌きます
@@ -31,7 +32,7 @@ export default async (actor: IRemoteUser, activity: IDelete): Promise<void> => {
 		break;
 
 	default:
-		console.warn(`Unknown type: ${object.type}`);
+		apLogger.warn(`Unknown type: ${object.type}`);
 		break;
 	}
 };
diff --git a/src/remote/activitypub/kernel/delete/note.ts b/src/remote/activitypub/kernel/delete/note.ts
index 1951982f69..f67919c56b 100644
--- a/src/remote/activitypub/kernel/delete/note.ts
+++ b/src/remote/activitypub/kernel/delete/note.ts
@@ -1,13 +1,12 @@
-import * as debug from 'debug';
-
 import Note from '../../../../models/note';
 import { IRemoteUser } from '../../../../models/user';
 import deleteNode from '../../../../services/note/delete';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async function(actor: IRemoteUser, uri: string): Promise<void> {
-	log(`Deleting the Note: ${uri}`);
+	logger.info(`Deleting the Note: ${uri}`);
 
 	const note = await Note.findOne({ uri });
 
diff --git a/src/remote/activitypub/kernel/index.ts b/src/remote/activitypub/kernel/index.ts
index 61bb89f5e9..7cf9ba8334 100644
--- a/src/remote/activitypub/kernel/index.ts
+++ b/src/remote/activitypub/kernel/index.ts
@@ -11,6 +11,7 @@ import reject from './reject';
 import add from './add';
 import remove from './remove';
 import block from './block';
+import { apLogger } from '../logger';
 
 const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 	switch (activity.type) {
@@ -35,11 +36,11 @@ const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 		break;
 
 	case 'Add':
-		await add(actor, activity).catch(err => console.log(err));
+		await add(actor, activity).catch(err => apLogger.error(err));
 		break;
 
 	case 'Remove':
-		await remove(actor, activity).catch(err => console.log(err));
+		await remove(actor, activity).catch(err => apLogger.error(err));
 		break;
 
 	case 'Announce':
@@ -64,7 +65,7 @@ const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 		break;
 
 	default:
-		console.warn(`unknown activity type: ${(activity as any).type}`);
+		apLogger.warn(`unknown activity type: ${(activity as any).type}`);
 		return null;
 	}
 };
diff --git a/src/remote/activitypub/kernel/reject/index.ts b/src/remote/activitypub/kernel/reject/index.ts
index d89985c238..c3585abbb6 100644
--- a/src/remote/activitypub/kernel/reject/index.ts
+++ b/src/remote/activitypub/kernel/reject/index.ts
@@ -1,16 +1,15 @@
-import * as debug from 'debug';
-
 import Resolver from '../../resolver';
 import { IRemoteUser } from '../../../../models/user';
 import rejectFollow from './follow';
 import { IReject, IFollow } from '../../type';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IReject): Promise<void> => {
 	const uri = activity.id || activity;
 
-	log(`Reject: ${uri}`);
+	logger.info(`Reject: ${uri}`);
 
 	const resolver = new Resolver();
 
@@ -19,7 +18,7 @@ export default async (actor: IRemoteUser, activity: IReject): Promise<void> => {
 	try {
 		object = await resolver.resolve(activity.object);
 	} catch (e) {
-		log(`Resolution failed: ${e}`);
+		logger.error(`Resolution failed: ${e}`);
 		throw e;
 	}
 
@@ -29,7 +28,7 @@ export default async (actor: IRemoteUser, activity: IReject): Promise<void> => {
 		break;
 
 	default:
-		console.warn(`Unknown reject type: ${object.type}`);
+		logger.warn(`Unknown reject type: ${object.type}`);
 		break;
 	}
 };
diff --git a/src/remote/activitypub/kernel/undo/block.ts b/src/remote/activitypub/kernel/undo/block.ts
index b735f114d0..4a22ac7924 100644
--- a/src/remote/activitypub/kernel/undo/block.ts
+++ b/src/remote/activitypub/kernel/undo/block.ts
@@ -1,18 +1,18 @@
 import * as mongo from 'mongodb';
 import User, { IRemoteUser } from '../../../../models/user';
 import config from '../../../../config';
-import * as debug from 'debug';
 import { IBlock } from '../../type';
 import unblock from '../../../../services/blocking/delete';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
 	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
 
 	const uri = activity.id || activity;
 
-	log(`UnBlock: ${uri}`);
+	logger.info(`UnBlock: ${uri}`);
 
 	if (!id.startsWith(config.url + '/')) {
 		return null;
diff --git a/src/remote/activitypub/kernel/undo/index.ts b/src/remote/activitypub/kernel/undo/index.ts
index 471988f052..80b44fae04 100644
--- a/src/remote/activitypub/kernel/undo/index.ts
+++ b/src/remote/activitypub/kernel/undo/index.ts
@@ -1,13 +1,12 @@
-import * as debug from 'debug';
-
 import { IRemoteUser } from '../../../../models/user';
 import { IUndo, IFollow, IBlock, ILike } from '../../type';
 import unfollow from './follow';
 import unblock from './block';
 import undoLike from './like';
 import Resolver from '../../resolver';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 	if ('actor' in activity && actor.uri !== activity.actor) {
@@ -16,7 +15,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 
 	const uri = activity.id || activity;
 
-	log(`Undo: ${uri}`);
+	logger.info(`Undo: ${uri}`);
 
 	const resolver = new Resolver();
 
@@ -25,7 +24,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 	try {
 		object = await resolver.resolve(activity.object);
 	} catch (e) {
-		log(`Resolution failed: ${e}`);
+		logger.error(`Resolution failed: ${e}`);
 		throw e;
 	}