From aaa167fd5765360631af3b2c3af416e3f2db30e9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 17 Apr 2018 16:05:50 +0900 Subject: Refactor --- src/remote/activitypub/objects/image.ts | 36 ----- src/remote/activitypub/objects/note.ts | 115 ---------------- src/remote/activitypub/objects/person.ts | 221 ------------------------------- 3 files changed, 372 deletions(-) delete mode 100644 src/remote/activitypub/objects/image.ts delete mode 100644 src/remote/activitypub/objects/note.ts delete mode 100644 src/remote/activitypub/objects/person.ts (limited to 'src/remote/activitypub/objects') diff --git a/src/remote/activitypub/objects/image.ts b/src/remote/activitypub/objects/image.ts deleted file mode 100644 index d7bc5aff2f..0000000000 --- a/src/remote/activitypub/objects/image.ts +++ /dev/null @@ -1,36 +0,0 @@ -import * as debug from 'debug'; - -import uploadFromUrl from '../../../services/drive/upload-from-url'; -import { IRemoteUser } from '../../../models/user'; -import { IDriveFile } from '../../../models/drive-file'; -import Resolver from '../resolver'; - -const log = debug('misskey:activitypub'); - -/** - * Imageを作成します。 - */ -export async function createImage(actor: IRemoteUser, value): Promise { - const image = await new Resolver().resolve(value); - - if (image.url == null) { - throw new Error('invalid image: url not privided'); - } - - log(`Creating the Image: ${image.url}`); - - return await uploadFromUrl(image.url, actor); -} - -/** - * Imageを解決します。 - * - * Misskeyに対象のImageが登録されていればそれを返し、そうでなければ - * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。 - */ -export async function resolveImage(actor: IRemoteUser, value: any): Promise { - // TODO - - // リモートサーバーからフェッチしてきて登録 - return await createImage(actor, value); -} diff --git a/src/remote/activitypub/objects/note.ts b/src/remote/activitypub/objects/note.ts deleted file mode 100644 index 221d502f06..0000000000 --- a/src/remote/activitypub/objects/note.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { JSDOM } from 'jsdom'; -import * as debug from 'debug'; - -import config from '../../../config'; -import Resolver from '../resolver'; -import Note, { INote } from '../../../models/note'; -import post from '../../../services/note/create'; -import { INote as INoteActivityStreamsObject, IObject } from '../type'; -import { resolvePerson, updatePerson } from './person'; -import { resolveImage } from './image'; -import { IRemoteUser } from '../../../models/user'; - -const log = debug('misskey:activitypub'); - -/** - * Noteをフェッチします。 - * - * Misskeyに対象のNoteが登録されていればそれを返します。 - */ -export async function fetchNote(value: string | IObject, resolver?: Resolver): Promise { - const uri = typeof value == 'string' ? value : value.id; - - // URIがこのサーバーを指しているならデータベースからフェッチ - if (uri.startsWith(config.url + '/')) { - return await Note.findOne({ _id: uri.split('/').pop() }); - } - - //#region このサーバーに既に登録されていたらそれを返す - const exist = await Note.findOne({ uri }); - - if (exist) { - return exist; - } - //#endregion - - return null; -} - -/** - * Noteを作成します。 - */ -export async function createNote(value: any, resolver?: Resolver, silent = false): Promise { - if (resolver == null) resolver = new Resolver(); - - const object = await resolver.resolve(value) as any; - - if (object == null || object.type !== 'Note') { - throw new Error('invalid note'); - } - - const note: INoteActivityStreamsObject = object; - - log(`Creating the Note: ${note.id}`); - - // 投稿者をフェッチ - const actor = await resolvePerson(note.attributedTo) as IRemoteUser; - - //#region Visibility - let visibility = 'public'; - if (!note.to.includes('https://www.w3.org/ns/activitystreams#Public')) visibility = 'unlisted'; - if (note.cc.length == 0) visibility = 'private'; - // TODO - if (visibility != 'public') throw new Error('unspported visibility'); - //#endergion - - // 添付メディア - // TODO: attachmentは必ずしもImageではない - // TODO: attachmentは必ずしも配列ではない - const media = note.attachment - ? await Promise.all(note.attachment.map(x => resolveImage(actor, x))) - : []; - - // リプライ - const reply = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver) : null; - - const { window } = new JSDOM(note.content); - - // ユーザーの情報が古かったらついでに更新しておく - if (actor.updatedAt && Date.now() - actor.updatedAt.getTime() > 1000 * 60 * 60 * 24) { - updatePerson(note.attributedTo); - } - - return await post(actor, { - createdAt: new Date(note.published), - media, - reply, - renote: undefined, - text: window.document.body.textContent, - viaMobile: false, - geo: undefined, - visibility, - uri: note.id - }, silent); -} - -/** - * Noteを解決します。 - * - * Misskeyに対象のNoteが登録されていればそれを返し、そうでなければ - * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。 - */ -export async function resolveNote(value: string | IObject, resolver?: Resolver): Promise { - const uri = typeof value == 'string' ? value : value.id; - - //#region このサーバーに既に登録されていたらそれを返す - const exist = await fetchNote(uri); - - if (exist) { - return exist; - } - //#endregion - - // リモートサーバーからフェッチしてきて登録 - return await createNote(value, resolver); -} diff --git a/src/remote/activitypub/objects/person.ts b/src/remote/activitypub/objects/person.ts deleted file mode 100644 index b755b2603a..0000000000 --- a/src/remote/activitypub/objects/person.ts +++ /dev/null @@ -1,221 +0,0 @@ -import { JSDOM } from 'jsdom'; -import { toUnicode } from 'punycode'; -import * as debug from 'debug'; - -import config from '../../../config'; -import User, { validateUsername, isValidName, IUser, IRemoteUser } from '../../../models/user'; -import webFinger from '../../webfinger'; -import Resolver from '../resolver'; -import { resolveImage } from './image'; -import { isCollectionOrOrderedCollection, IObject, IPerson } from '../type'; - -const log = debug('misskey:activitypub'); - -/** - * Personをフェッチします。 - * - * Misskeyに対象のPersonが登録されていればそれを返します。 - */ -export async function fetchPerson(value: string | IObject, resolver?: Resolver): Promise { - const uri = typeof value == 'string' ? value : value.id; - - // URIがこのサーバーを指しているならデータベースからフェッチ - if (uri.startsWith(config.url + '/')) { - return await User.findOne({ _id: uri.split('/').pop() }); - } - - //#region このサーバーに既に登録されていたらそれを返す - const exist = await User.findOne({ uri }); - - if (exist) { - return exist; - } - //#endregion - - return null; -} - -/** - * Personを作成します。 - */ -export async function createPerson(value: any, resolver?: Resolver): Promise { - if (resolver == null) resolver = new Resolver(); - - const object = await resolver.resolve(value) as any; - - if ( - object == null || - object.type !== 'Person' || - typeof object.preferredUsername !== 'string' || - !validateUsername(object.preferredUsername) || - !isValidName(object.name == '' ? null : object.name) - ) { - log(`invalid person: ${JSON.stringify(object, null, 2)}`); - throw new Error('invalid person'); - } - - const person: IPerson = object; - - log(`Creating the Person: ${person.id}`); - - const [followersCount = 0, followingCount = 0, notesCount = 0, finger] = await Promise.all([ - resolver.resolve(person.followers).then( - resolved => isCollectionOrOrderedCollection(resolved) ? resolved.totalItems : undefined, - () => undefined - ), - resolver.resolve(person.following).then( - resolved => isCollectionOrOrderedCollection(resolved) ? resolved.totalItems : undefined, - () => undefined - ), - resolver.resolve(person.outbox).then( - resolved => isCollectionOrOrderedCollection(resolved) ? resolved.totalItems : undefined, - () => undefined - ), - webFinger(person.id) - ]); - - const host = toUnicode(finger.subject.replace(/^.*?@/, '')).toLowerCase(); - const summaryDOM = JSDOM.fragment(person.summary); - - // Create user - const user = await User.insert({ - avatarId: null, - bannerId: null, - createdAt: Date.parse(person.published) || null, - description: summaryDOM.textContent, - followersCount, - followingCount, - notesCount, - name: person.name, - driveCapacity: 1024 * 1024 * 8, // 8MiB - username: person.preferredUsername, - usernameLower: person.preferredUsername.toLowerCase(), - host, - publicKey: { - id: person.publicKey.id, - publicKeyPem: person.publicKey.publicKeyPem - }, - inbox: person.inbox, - uri: person.id, - url: person.url - }) as IRemoteUser; - - //#region アイコンとヘッダー画像をフェッチ - const [avatarId, bannerId] = (await Promise.all([ - person.icon, - person.image - ].map(img => - img == null - ? Promise.resolve(null) - : resolveImage(user, img) - ))).map(file => file != null ? file._id : null); - - User.update({ _id: user._id }, { $set: { avatarId, bannerId } }); - - user.avatarId = avatarId; - user.bannerId = bannerId; - //#endregion - - return user; -} - -/** - * Personの情報を更新します。 - * - * Misskeyに対象のPersonが登録されていなければ無視します。 - */ -export async function updatePerson(value: string | IObject, resolver?: Resolver): Promise { - const uri = typeof value == 'string' ? value : value.id; - - // URIがこのサーバーを指しているならスキップ - if (uri.startsWith(config.url + '/')) { - return; - } - - //#region このサーバーに既に登録されているか - const exist = await User.findOne({ uri }) as IRemoteUser; - - if (exist == null) { - return; - } - //#endregion - - if (resolver == null) resolver = new Resolver(); - - const object = await resolver.resolve(value) as any; - - if ( - object == null || - object.type !== 'Person' - ) { - log(`invalid person: ${JSON.stringify(object, null, 2)}`); - throw new Error('invalid person'); - } - - const person: IPerson = object; - - log(`Updating the Person: ${person.id}`); - - const [followersCount = 0, followingCount = 0, notesCount = 0] = await Promise.all([ - resolver.resolve(person.followers).then( - resolved => isCollectionOrOrderedCollection(resolved) ? resolved.totalItems : undefined, - () => undefined - ), - resolver.resolve(person.following).then( - resolved => isCollectionOrOrderedCollection(resolved) ? resolved.totalItems : undefined, - () => undefined - ), - resolver.resolve(person.outbox).then( - resolved => isCollectionOrOrderedCollection(resolved) ? resolved.totalItems : undefined, - () => undefined - ) - ]); - - const summaryDOM = JSDOM.fragment(person.summary); - - // アイコンとヘッダー画像をフェッチ - const [avatarId, bannerId] = (await Promise.all([ - person.icon, - person.image - ].map(img => - img == null - ? Promise.resolve(null) - : resolveImage(exist, img) - ))).map(file => file != null ? file._id : null); - - // Update user - await User.update({ _id: exist._id }, { - $set: { - updatedAt: new Date(), - avatarId, - bannerId, - description: summaryDOM.textContent, - followersCount, - followingCount, - notesCount, - name: person.name, - url: person.url - } - }); -} - -/** - * Personを解決します。 - * - * Misskeyに対象のPersonが登録されていればそれを返し、そうでなければ - * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。 - */ -export async function resolvePerson(value: string | IObject, verifier?: string): Promise { - const uri = typeof value == 'string' ? value : value.id; - - //#region このサーバーに既に登録されていたらそれを返す - const exist = await fetchPerson(uri); - - if (exist) { - return exist; - } - //#endregion - - // リモートサーバーからフェッチしてきて登録 - return await createPerson(value); -} -- cgit v1.2.3-freya