sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes and refactors

Browse Source
This commit is contained in:
syuilo
2018-04-01 21:24:25 +09:00
parent 623f5b0072
commit 79f87b6943
7 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/remote/activitypub/create.ts
View File

@@ -3,6 +3,7 @@ import config from '../../../conf';
import Post from '../../../models/post';
import RemoteUserObject, { IRemoteUserObject } from '../../../models/remote-user-object';
import uploadFromUrl from '../../drive/upload_from_url';
import Resolver from './resolver';
const createDOMPurify = require('dompurify');
function createRemoteUserObject($ref, $id, { id }) {
@@ -17,7 +18,7 @@ function createRemoteUserObject($ref, $id, { id }) {
async function createImage(actor, object) {
if ('attributedTo' in object && actor.account.uri !== object.attributedTo) {
throw new Error;
throw new Error();
}
const { _id } = await uploadFromUrl(object.url, actor);
@@ -26,7 +27,7 @@ async function createImage(actor, object) {
async function createNote(resolver, actor, object) {
if ('attributedTo' in object && actor.account.uri !== object.attributedTo) {
throw new Error;
throw new Error();
}
const mediaIds = 'attachment' in object &&
@@ -69,10 +70,10 @@ async function createNote(resolver, actor, object) {
return createRemoteUserObject('posts', _id, object);
}
export default async function create(parentResolver, actor, value): Promise<Promise<IRemoteUserObject>[]> {
export default async function create(parentResolver: Resolver, actor, value): Promise<Array<Promise<IRemoteUserObject>>> {
const results = await parentResolver.resolveRemoteUserObjects(value);
return results.map(asyncResult => asyncResult.then(({ resolver, object }) => {
return results.map(promisedResult => promisedResult.then(({ resolver, object }) => {
switch (object.type) {
case 'Image':
return createImage(actor, object);
@@ -83,4 +84,4 @@ export default async function create(parentResolver, actor, value): Promise<Prom
return null;
}));
};
}