This commit is contained in:
syuilo
2018-06-18 14:28:43 +09:00
parent 80e5645a84
commit e66d7babc5
56 changed files with 115 additions and 112 deletions

View File

@ -1,4 +1,4 @@
export default object => ({
export default (object: any) => ({
type: 'Accept',
object
});

View File

@ -1,4 +1,4 @@
export default object => ({
export default (object: any) => ({
type: 'Announce',
object
});

View File

@ -1,4 +1,4 @@
export default object => ({
export default (object: any) => ({
type: 'Create',
object
});

View File

@ -1,4 +1,4 @@
export default object => ({
export default (object: any) => ({
type: 'Delete',
object
});

View File

@ -1,7 +1,8 @@
import config from '../../../config';
import { IDriveFile } from '../../../models/drive-file';
export default ({ _id, contentType }) => ({
export default (file: IDriveFile) => ({
type: 'Document',
mediaType: contentType,
url: `${config.drive_url}/${_id}`
mediaType: file.contentType,
url: `${config.drive_url}/${file._id}`
});

View File

@ -1,6 +1,7 @@
import config from '../../../config';
import { IDriveFile } from '../../../models/drive-file';
export default ({ _id }) => ({
export default (fileId: IDriveFile['_id']) => ({
type: 'Image',
url: `${config.drive_url}/${_id}`
url: `${config.drive_url}/${fileId}`
});

View File

@ -1,7 +1,8 @@
import config from '../../../config';
import { ILocalUser } from '../../../models/user';
import { INote } from '../../../models/note';
export default (user: ILocalUser, note, reaction: string) => ({
export default (user: ILocalUser, note: INote, reaction: string) => ({
type: 'Like',
actor: `${config.url}/users/${user._id}`,
object: note.uri ? note.uri : `${config.url}/notes/${note._id}`,

View File

@ -1,5 +1,5 @@
import { IUser, isRemoteUser } from "../../../models/user";
import config from "../../../config";
import { IUser, isRemoteUser } from '../../../models/user';
import config from '../../../config';
export default (mention: IUser) => ({
type: 'Mention',

View File

@ -2,13 +2,13 @@ import renderDocument from './document';
import renderHashtag from './hashtag';
import renderMention from './mention';
import config from '../../../config';
import DriveFile from '../../../models/drive-file';
import DriveFile, { IDriveFile } from '../../../models/drive-file';
import Note, { INote } from '../../../models/note';
import User from '../../../models/user';
import toHtml from '../misc/get-note-html';
export default async function renderNote(note: INote, dive = true) {
const promisedFiles = note.mediaIds
export default async function renderNote(note: INote, dive = true): Promise<any> {
const promisedFiles: Promise<IDriveFile[]> = note.mediaIds
? DriveFile.find({ _id: { $in: note.mediaIds } })
: Promise.resolve([]);

View File

@ -16,8 +16,8 @@ export default (user: ILocalUser) => {
preferredUsername: user.username,
name: user.name,
summary: user.description,
icon: user.avatarId && renderImage({ _id: user.avatarId }),
image: user.bannerId && renderImage({ _id: user.bannerId }),
icon: user.avatarId && renderImage(user.avatarId),
image: user.bannerId && renderImage(user.bannerId),
manuallyApprovesFollowers: user.isLocked,
publicKey: renderKey(user)
};

View File

@ -1,4 +1,4 @@
export default object => ({
export default (object: any) => ({
type: 'Undo',
object
});