From 59d67d314069c19dcc5c2c7d82f260a9f8c661cd Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 24 Sep 2018 16:26:12 +0900 Subject: ピン留めを解除することができるようにしたり MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/i/pin.ts | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'src/services') diff --git a/src/services/i/pin.ts b/src/services/i/pin.ts index 5bf8d166bb..8b7287e68d 100644 --- a/src/services/i/pin.ts +++ b/src/services/i/pin.ts @@ -7,7 +7,7 @@ import renderRemove from '../../remote/activitypub/renderer/remove'; import packAp from '../../remote/activitypub/renderer'; import { deliver } from '../../queue'; -export async function deliverPinnedChange(userId: mongo.ObjectID, oldId?: mongo.ObjectID, newId?: mongo.ObjectID) { +export async function deliverPinnedChange(userId: mongo.ObjectID, noteId: mongo.ObjectID, isAddition: boolean) { const user = await User.findOne({ _id: userId }); @@ -20,21 +20,11 @@ export async function deliverPinnedChange(userId: mongo.ObjectID, oldId?: mongo. const target = `${config.url}/users/${user._id}/collections/featured`; - if (oldId) { - const oldItem = `${config.url}/notes/${oldId}`; - const content = packAp(renderRemove(user, target, oldItem)); - queue.forEach(inbox => { - deliver(user, content, inbox); - }); - } - - if (newId) { - const newItem = `${config.url}/notes/${newId}`; - const content = packAp(renderAdd(user, target, newItem)); - queue.forEach(inbox => { - deliver(user, content, inbox); - }); - } + const item = `${config.url}/notes/${noteId}`; + const content = packAp(isAddition ? renderAdd(user, target, item) : renderRemove(user, target, item)); + queue.forEach(inbox => { + deliver(user, content, inbox); + }); } /** -- cgit v1.2.3-freya