From 6e34e77372bd74c85ebf5a6b4214c818231dbe8b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 8 Apr 2018 06:55:26 +0900
Subject: Implement announce

And bug fixes
---
 src/remote/activitypub/renderer/announce.ts | 4 ++++
 src/remote/activitypub/renderer/like.ts     | 3 ++-
 src/remote/activitypub/renderer/note.ts     | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 src/remote/activitypub/renderer/announce.ts

(limited to 'src/remote/activitypub/renderer')

diff --git a/src/remote/activitypub/renderer/announce.ts b/src/remote/activitypub/renderer/announce.ts
new file mode 100644
index 0000000000..8e4b3d26a6
--- /dev/null
+++ b/src/remote/activitypub/renderer/announce.ts
@@ -0,0 +1,4 @@
+export default object => ({
+	type: 'Announce',
+	object
+});
diff --git a/src/remote/activitypub/renderer/like.ts b/src/remote/activitypub/renderer/like.ts
index fe36c7094d..744896cc41 100644
--- a/src/remote/activitypub/renderer/like.ts
+++ b/src/remote/activitypub/renderer/like.ts
@@ -1,6 +1,7 @@
 import config from '../../../config';
+import { ILocalUser } from '../../../models/user';
 
-export default (user, note) => {
+export default (user: ILocalUser, note) => {
 	return {
 		type: 'Like',
 		actor: `${config.url}/@${user.username}`,
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index 244aecf6a3..48799af084 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -3,9 +3,9 @@ import renderHashtag from './hashtag';
 import config from '../../../config';
 import DriveFile from '../../../models/drive-file';
 import Note, { INote } from '../../../models/note';
-import User, { IUser } from '../../../models/user';
+import User from '../../../models/user';
 
-export default async (user: IUser, note: INote) => {
+export default async (note: INote) => {
 	const promisedFiles = note.mediaIds
 		? DriveFile.find({ _id: { $in: note.mediaIds } })
 		: Promise.resolve([]);
@@ -30,6 +30,10 @@ export default async (user: IUser, note: INote) => {
 		inReplyTo = null;
 	}
 
+	const user = await User.findOne({
+		_id: note.userId
+	});
+
 	const attributedTo = `${config.url}/@${user.username}`;
 
 	return {
-- 
cgit v1.2.3-freya