summaryrefslogtreecommitdiff
path: root/src/services/note
diff options
context:
space:
mode:
Diffstat (limited to 'src/services/note')
-rw-r--r--src/services/note/create.ts8
-rw-r--r--src/services/note/delete.ts4
-rw-r--r--src/services/note/reaction/create.ts4
-rw-r--r--src/services/note/reaction/delete.ts4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 4e8e707961..622f334c0a 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -7,7 +7,7 @@ import { deliver } from '../../queue';
import renderNote from '../../remote/activitypub/renderer/note';
import renderCreate from '../../remote/activitypub/renderer/create';
import renderAnnounce from '../../remote/activitypub/renderer/announce';
-import packAp from '../../remote/activitypub/renderer';
+import { renderActivity } from '../../remote/activitypub/renderer';
import DriveFile, { IDriveFile } from '../../models/drive-file';
import notify from '../../notify';
import NoteWatching from '../../models/note-watching';
@@ -283,7 +283,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
createMentionedEvents(mentionedUsers, note, nm);
- const noteActivity = await renderActivity(data, note);
+ const noteActivity = await renderNoteOrRenoteActivity(data, note);
if (isLocalUser(user)) {
deliverNoteToMentionedRemoteUsers(mentionedUsers, user, noteActivity);
@@ -341,14 +341,14 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
index(note);
});
-async function renderActivity(data: Option, note: INote) {
+async function renderNoteOrRenoteActivity(data: Option, note: INote) {
if (data.localOnly) return null;
const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length == 0)
? renderAnnounce(data.renote.uri ? data.renote.uri : `${config.url}/notes/${data.renote._id}`, note)
: renderCreate(await renderNote(note, false), note);
- return packAp(content);
+ return renderActivity(content);
}
function incRenoteCount(renote: INote) {
diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts
index e8ce181d54..aaaa79afdf 100644
--- a/src/services/note/delete.ts
+++ b/src/services/note/delete.ts
@@ -2,7 +2,7 @@ import Note, { INote } from '../../models/note';
import { IUser, isLocalUser } from '../../models/user';
import { publishNoteStream } from '../../stream';
import renderDelete from '../../remote/activitypub/renderer/delete';
-import pack from '../../remote/activitypub/renderer';
+import { renderActivity } from '../../remote/activitypub/renderer';
import { deliver } from '../../queue';
import Following from '../../models/following';
import renderTombstone from '../../remote/activitypub/renderer/tombstone';
@@ -75,7 +75,7 @@ export default async function(user: IUser, note: INote) {
//#region ローカルの投稿なら削除アクティビティを配送
if (isLocalUser(user)) {
- const content = pack(renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user));
+ const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user));
const followings = await Following.find({
followeeId: user._id,
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index 4f56f399a8..a7ee1311ce 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -7,7 +7,7 @@ import NoteWatching from '../../../models/note-watching';
import watch from '../watch';
import renderLike from '../../../remote/activitypub/renderer/like';
import { deliver } from '../../../queue';
-import pack from '../../../remote/activitypub/renderer';
+import { renderActivity } from '../../../remote/activitypub/renderer';
import perUserReactionsChart from '../../../chart/per-user-reactions';
export default async (user: IUser, note: INote, reaction: string) => new Promise(async (res, rej) => {
@@ -86,7 +86,7 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise
//#region 配信
// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
if (isLocalUser(user) && isRemoteUser(note._user)) {
- const content = pack(renderLike(user, note, reaction));
+ const content = renderActivity(renderLike(user, note, reaction));
deliver(user, content, note._user.inbox);
}
//#endregion
diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts
index b108f0ba75..8689730433 100644
--- a/src/services/note/reaction/delete.ts
+++ b/src/services/note/reaction/delete.ts
@@ -4,7 +4,7 @@ import Reaction from '../../../models/note-reaction';
import { publishNoteStream } from '../../../stream';
import renderLike from '../../../remote/activitypub/renderer/like';
import renderUndo from '../../../remote/activitypub/renderer/undo';
-import pack from '../../../remote/activitypub/renderer';
+import { renderActivity } from '../../../remote/activitypub/renderer';
import { deliver } from '../../../queue';
export default async (user: IUser, note: INote) => new Promise(async (res, rej) => {
@@ -42,7 +42,7 @@ export default async (user: IUser, note: INote) => new Promise(async (res, rej)
//#region 配信
// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
if (isLocalUser(user) && isRemoteUser(note._user)) {
- const content = pack(renderUndo(renderLike(user, note, exist.reaction), user));
+ const content = renderActivity(renderUndo(renderLike(user, note, exist.reaction), user));
deliver(user, content, note._user.inbox);
}
//#endregion