yatta

11 files changed, 21 insertions, 18 deletions

diff --git a/src/remote/activitypub/renderer/accept.ts b/src/remote/activitypub/renderer/accept.ts
index 00c76883a9..76326285fd 100644
--- a/src/remote/activitypub/renderer/accept.ts
+++ b/src/remote/activitypub/renderer/accept.ts
@@ -1,4 +1,4 @@
-export default object => ({
+export default (object: any) => ({
 	type: 'Accept',
 	object
 });
diff --git a/src/remote/activitypub/renderer/announce.ts b/src/remote/activitypub/renderer/announce.ts
index 8e4b3d26a6..8c3ff9f113 100644
--- a/src/remote/activitypub/renderer/announce.ts
+++ b/src/remote/activitypub/renderer/announce.ts
@@ -1,4 +1,4 @@
-export default object => ({
+export default (object: any) => ({
 	type: 'Announce',
 	object
 });
diff --git a/src/remote/activitypub/renderer/create.ts b/src/remote/activitypub/renderer/create.ts
index de411e1951..b8bf98a655 100644
--- a/src/remote/activitypub/renderer/create.ts
+++ b/src/remote/activitypub/renderer/create.ts
@@ -1,4 +1,4 @@
-export default object => ({
+export default (object: any) => ({
 	type: 'Create',
 	object
 });
diff --git a/src/remote/activitypub/renderer/delete.ts b/src/remote/activitypub/renderer/delete.ts
index d15cb447e6..f468a22e24 100644
--- a/src/remote/activitypub/renderer/delete.ts
+++ b/src/remote/activitypub/renderer/delete.ts
@@ -1,4 +1,4 @@
-export default object => ({
+export default (object: any) => ({
 	type: 'Delete',
 	object
 });
diff --git a/src/remote/activitypub/renderer/document.ts b/src/remote/activitypub/renderer/document.ts
index 91a9f7df38..1985c6bc8b 100644
--- a/src/remote/activitypub/renderer/document.ts
+++ b/src/remote/activitypub/renderer/document.ts
@@ -1,7 +1,8 @@
 import config from '../../../config';
+import { IDriveFile } from '../../../models/drive-file';
 
-export default ({ _id, contentType }) => ({
+export default (file: IDriveFile) => ({
 	type: 'Document',
-	mediaType: contentType,
-	url: `${config.drive_url}/${_id}`
+	mediaType: file.contentType,
+	url: `${config.drive_url}/${file._id}`
 });
diff --git a/src/remote/activitypub/renderer/image.ts b/src/remote/activitypub/renderer/image.ts
index d671a57e7c..cf91ce3a0c 100644
--- a/src/remote/activitypub/renderer/image.ts
+++ b/src/remote/activitypub/renderer/image.ts
@@ -1,6 +1,7 @@
 import config from '../../../config';
+import { IDriveFile } from '../../../models/drive-file';
 
-export default ({ _id }) => ({
+export default (fileId: IDriveFile['_id']) => ({
 	type: 'Image',
-	url: `${config.drive_url}/${_id}`
+	url: `${config.drive_url}/${fileId}`
 });
diff --git a/src/remote/activitypub/renderer/like.ts b/src/remote/activitypub/renderer/like.ts
index 33e1341a20..523cb4f1ad 100644
--- a/src/remote/activitypub/renderer/like.ts
+++ b/src/remote/activitypub/renderer/like.ts
@@ -1,7 +1,8 @@
 import config from '../../../config';
 import { ILocalUser } from '../../../models/user';
+import { INote } from '../../../models/note';
 
-export default (user: ILocalUser, note, reaction: string) => ({
+export default (user: ILocalUser, note: INote, reaction: string) => ({
 	type: 'Like',
 	actor: `${config.url}/users/${user._id}`,
 	object: note.uri ? note.uri : `${config.url}/notes/${note._id}`,
diff --git a/src/remote/activitypub/renderer/mention.ts b/src/remote/activitypub/renderer/mention.ts
index 95cae52aa2..8d12e6d8bf 100644
--- a/src/remote/activitypub/renderer/mention.ts
+++ b/src/remote/activitypub/renderer/mention.ts
@@ -1,5 +1,5 @@
-import { IUser, isRemoteUser } from "../../../models/user";
-import config from "../../../config";
+import { IUser, isRemoteUser } from '../../../models/user';
+import config from '../../../config';
 
 export default (mention: IUser) => ({
 	type: 'Mention',
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index 556054fa93..b908f8bb1e 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -2,13 +2,13 @@ import renderDocument from './document';
 import renderHashtag from './hashtag';
 import renderMention from './mention';
 import config from '../../../config';
-import DriveFile from '../../../models/drive-file';
+import DriveFile, { IDriveFile } from '../../../models/drive-file';
 import Note, { INote } from '../../../models/note';
 import User from '../../../models/user';
 import toHtml from '../misc/get-note-html';
 
-export default async function renderNote(note: INote, dive = true) {
-	const promisedFiles = note.mediaIds
+export default async function renderNote(note: INote, dive = true): Promise<any> {
+	const promisedFiles: Promise<IDriveFile[]> = note.mediaIds
 		? DriveFile.find({ _id: { $in: note.mediaIds } })
 		: Promise.resolve([]);
 
diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts
index b2ac885f46..8825c56c25 100644
--- a/src/remote/activitypub/renderer/person.ts
+++ b/src/remote/activitypub/renderer/person.ts
@@ -16,8 +16,8 @@ export default (user: ILocalUser) => {
 		preferredUsername: user.username,
 		name: user.name,
 		summary: user.description,
-		icon: user.avatarId && renderImage({ _id: user.avatarId }),
-		image: user.bannerId && renderImage({ _id: user.bannerId }),
+		icon: user.avatarId && renderImage(user.avatarId),
+		image: user.bannerId && renderImage(user.bannerId),
 		manuallyApprovesFollowers: user.isLocked,
 		publicKey: renderKey(user)
 	};
diff --git a/src/remote/activitypub/renderer/undo.ts b/src/remote/activitypub/renderer/undo.ts
index f38e224b60..4498409a57 100644
--- a/src/remote/activitypub/renderer/undo.ts
+++ b/src/remote/activitypub/renderer/undo.ts
@@ -1,4 +1,4 @@
-export default object => ({
+export default (object: any) => ({
 	type: 'Undo',
 	object
 });