diff options
Diffstat (limited to 'src/services/i/pin.ts')
| -rw-r--r-- | src/services/i/pin.ts | 95 |
1 files changed, 44 insertions, 51 deletions
diff --git a/src/services/i/pin.ts b/src/services/i/pin.ts index 4d0ae3c149..4e43421bdc 100644 --- a/src/services/i/pin.ts +++ b/src/services/i/pin.ts @@ -1,59 +1,51 @@ import config from '../../config'; -import * as mongo from 'mongodb'; -import User, { isLocalUser, isRemoteUser, ILocalUser, IUser } from '../../models/user'; -import Note, { packMany } from '../../models/note'; -import Following from '../../models/following'; import renderAdd from '../../remote/activitypub/renderer/add'; import renderRemove from '../../remote/activitypub/renderer/remove'; import { renderActivity } from '../../remote/activitypub/renderer'; import { deliver } from '../../queue'; import { IdentifiableError } from '../../misc/identifiable-error'; +import { User, ILocalUser } from '../../models/entities/user'; +import { Note } from '../../models/entities/note'; +import { Notes, UserNotePinings, Users, Followings } from '../../models'; +import { UserNotePining } from '../../models/entities/user-note-pinings'; +import { genId } from '../../misc/gen-id'; /** * 指定した投稿をピン留めします * @param user * @param noteId */ -export async function addPinned(user: IUser, noteId: mongo.ObjectID) { +export async function addPinned(user: User, noteId: Note['id']) { // Fetch pinee - const note = await Note.findOne({ - _id: noteId, - userId: user._id + const note = await Notes.findOne({ + id: noteId, + userId: user.id }); - if (note === null) { + if (note == null) { throw new IdentifiableError('70c4e51f-5bea-449c-a030-53bee3cce202', 'No such note.'); } - let pinnedNoteIds = user.pinnedNoteIds || []; + const pinings = await UserNotePinings.find({ userId: user.id }); - //#region 現在ピン留め投稿している投稿が実際にデータベースに存在しているのかチェック - // データベースの欠損などで存在していない(または破損している)場合があるので。 - // 存在していなかったらピン留め投稿から外す - const pinnedNotes = await packMany(pinnedNoteIds, null, { detail: true }); - - pinnedNoteIds = pinnedNoteIds.filter(id => pinnedNotes.some(n => n.id.toString() === id.toHexString())); - //#endregion - - if (pinnedNoteIds.length >= 5) { + if (pinings.length >= 5) { throw new IdentifiableError('15a018eb-58e5-4da1-93be-330fcc5e4e1a', 'You can not pin notes any more.'); } - if (pinnedNoteIds.some(id => id.equals(note._id))) { + if (pinings.some(pining => pining.noteId === note.id)) { throw new IdentifiableError('23f0cf4e-59a3-4276-a91d-61a5891c1514', 'That note has already been pinned.'); } - pinnedNoteIds.unshift(note._id); - - await User.update(user._id, { - $set: { - pinnedNoteIds: pinnedNoteIds - } - }); + await UserNotePinings.save({ + id: genId(), + createdAt: new Date(), + userId: user.id, + noteId: note.id + } as UserNotePining); // Deliver to remote followers - if (isLocalUser(user)) { - deliverPinnedChange(user._id, note._id, true); + if (Users.isLocalUser(user)) { + deliverPinnedChange(user.id, note.id, true); } } @@ -62,43 +54,40 @@ export async function addPinned(user: IUser, noteId: mongo.ObjectID) { * @param user * @param noteId */ -export async function removePinned(user: IUser, noteId: mongo.ObjectID) { +export async function removePinned(user: User, noteId: Note['id']) { // Fetch unpinee - const note = await Note.findOne({ - _id: noteId, - userId: user._id + const note = await Notes.findOne({ + id: noteId, + userId: user.id }); - if (note === null) { + if (note == null) { throw new IdentifiableError('b302d4cf-c050-400a-bbb3-be208681f40c', 'No such note.'); } - const pinnedNoteIds = (user.pinnedNoteIds || []).filter(id => !id.equals(note._id)); - - await User.update(user._id, { - $set: { - pinnedNoteIds: pinnedNoteIds - } + UserNotePinings.delete({ + userId: user.id, + noteId: note.id }); // Deliver to remote followers - if (isLocalUser(user)) { - deliverPinnedChange(user._id, noteId, false); + if (Users.isLocalUser(user)) { + deliverPinnedChange(user.id, noteId, false); } } -export async function deliverPinnedChange(userId: mongo.ObjectID, noteId: mongo.ObjectID, isAddition: boolean) { - const user = await User.findOne({ - _id: userId +export async function deliverPinnedChange(userId: User['id'], noteId: Note['id'], isAddition: boolean) { + const user = await Users.findOne({ + id: userId }); - if (!isLocalUser(user)) return; + if (!Users.isLocalUser(user)) return; const queue = await CreateRemoteInboxes(user); if (queue.length < 1) return; - const target = `${config.url}/users/${user._id}/collections/featured`; + const target = `${config.url}/users/${user.id}/collections/featured`; const item = `${config.url}/notes/${noteId}`; const content = renderActivity(isAddition ? renderAdd(user, target, item) : renderRemove(user, target, item)); @@ -112,16 +101,20 @@ export async function deliverPinnedChange(userId: mongo.ObjectID, noteId: mongo. * @param user ローカルユーザー */ async function CreateRemoteInboxes(user: ILocalUser): Promise<string[]> { - const followers = await Following.find({ - followeeId: user._id + const followers = await Followings.find({ + followeeId: user.id }); const queue: string[] = []; for (const following of followers) { - const follower = following._follower; + const follower = { + host: following.followerHost, + inbox: following.followerInbox, + sharedInbox: following.followerSharedInbox, + }; - if (isRemoteUser(follower)) { + if (follower.host !== null) { const inbox = follower.sharedInbox || follower.inbox; if (!queue.includes(inbox)) queue.push(inbox); } |