natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1097 from syuilo/refactor 

Refactor
This commit is contained in:
syuilo 2018-02-04 15:02:14 +09:00 committed by GitHub
parent 1dab37bdae bcd65d290d
commit 744c3e2ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
87 changed files with 1087 additions and 1162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/common/add-file-to-drive.ts
View File

@ -12,7 +12,7 @@ import prominence = require('prominence');
import DriveFile, { getGridFSBucket } from '../models/drive-file'; import DriveFile, { getGridFSBucket } from '../models/drive-file';
import DriveFolder from '../models/drive-folder'; import DriveFolder from '../models/drive-folder';
import serialize from '../serializers/drive-file'; import { pack } from '../models/drive-file';
import event, { publishDriveStream } from '../event'; import event, { publishDriveStream } from '../event';
import config from '../../conf'; import config from '../../conf';
@ -282,7 +282,7 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
log(`drive file has been created ${file._id}`); log(`drive file has been created ${file._id}`);
resolve(file); resolve(file);
serialize(file).then(serializedFile => { pack(file).then(serializedFile => {
// Publish drive_file_created event // Publish drive_file_created event
event(user._id, 'drive_file_created', serializedFile); event(user._id, 'drive_file_created', serializedFile);
publishDriveStream(user._id, 'file_created', serializedFile); publishDriveStream(user._id, 'file_created', serializedFile);

6
src/api/common/notify.ts
View File

@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
import Notification from '../models/notification'; import Notification from '../models/notification';
import Mute from '../models/mute'; import Mute from '../models/mute';
import event from '../event'; import event from '../event';
import serialize from '../serializers/notification'; import { pack } from '../models/notification';
export default ( export default (
notifiee: mongo.ObjectID, notifiee: mongo.ObjectID,
@ -27,7 +27,7 @@ export default (
// Publish notification event // Publish notification event
event(notifiee, 'notification', event(notifiee, 'notification',
await serialize(notification)); await pack(notification));
// 3秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する // 3秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
setTimeout(async () => { setTimeout(async () => {
@ -44,7 +44,7 @@ export default (
} }
//#endregion //#endregion
event(notifiee, 'unread_notification', await serialize(notification)); event(notifiee, 'unread_notification', await pack(notification));
} }
}, 3000); }, 3000);
}); });

7
src/api/endpoints/aggregation/posts/reactions.ts
View File

@ -35,10 +35,13 @@ module.exports = (params) => new Promise(async (res, rej) => {
{ deleted_at: { $gt: startTime } } { deleted_at: { $gt: startTime } }
] ]
}, { }, {
sort: {
_id: -1
},
fields: {
_id: false, _id: false,
post_id: false post_id: false
}, { }
sort: { created_at: -1 }
}); });
const graph = []; const graph = [];

7
src/api/endpoints/aggregation/users.ts
View File

@ -17,11 +17,14 @@ module.exports = params => new Promise(async (res, rej) => {
const users = await User const users = await User
.find({}, { .find({}, {
sort: {
_id: -1
},
fields: {
_id: false, _id: false,
created_at: true, created_at: true,
deleted_at: true deleted_at: true
}, { }
sort: { created_at: -1 }
}); });
const graph = []; const graph = [];

6
src/api/endpoints/app/create.ts
View File

@ -3,9 +3,7 @@
*/ */
import rndstr from 'rndstr'; import rndstr from 'rndstr';
import $ from 'cafy'; import $ from 'cafy';
import App from '../../models/app'; import App, { isValidNameId, pack } from '../../models/app';
import { isValidNameId } from '../../models/app';
import serialize from '../../serializers/app';
/** /**
* @swagger * @swagger
@ -106,5 +104,5 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
}); });
// Response // Response
res(await serialize(app)); res(await pack(app));
}); });

5
src/api/endpoints/app/show.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import App from '../../models/app'; import App, { pack } from '../../models/app';
import serialize from '../../serializers/app';
/** /**
* @swagger * @swagger
@ -67,7 +66,7 @@ module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) =>
} }
// Send response // Send response
res(await serialize(app, user, { res(await pack(app, user, {
includeSecret: isSecure && app.user_id.equals(user._id) includeSecret: isSecure && app.user_id.equals(user._id)
})); }));
}); });

5
src/api/endpoints/auth/session/show.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import AuthSess from '../../../models/auth-session'; import AuthSess, { pack } from '../../../models/auth-session';
import serialize from '../../../serializers/auth-session';
/** /**
* @swagger * @swagger
@ -67,5 +66,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
} }
// Response // Response
res(await serialize(session, user)); res(await pack(session, user));
}); });

4
src/api/endpoints/auth/session/userkey.ts
View File

@ -5,7 +5,7 @@ import $ from 'cafy';
import App from '../../../models/app'; import App from '../../../models/app';
import AuthSess from '../../../models/auth-session'; import AuthSess from '../../../models/auth-session';
import AccessToken from '../../../models/access-token'; import AccessToken from '../../../models/access-token';
import serialize from '../../../serializers/user'; import { pack } from '../../../models/user';
/** /**
* @swagger * @swagger
@ -102,7 +102,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
// Response // Response
res({ res({
access_token: accessToken.token, access_token: accessToken.token,
user: await serialize(session.user_id, null, { user: await pack(session.user_id, null, {
detail: true detail: true
}) })
}); });

5
src/api/endpoints/channels.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Channel from '../models/channel'; import Channel, { pack } from '../models/channel';
import serialize from '../serializers/channel';
/** /**
* Get all channels * Get all channels
@ -55,5 +54,5 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(channels.map(async channel => res(await Promise.all(channels.map(async channel =>
await serialize(channel, me)))); await pack(channel, me))));
}); });

4
src/api/endpoints/channels/create.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import Channel from '../../models/channel'; import Channel from '../../models/channel';
import Watching from '../../models/channel-watching'; import Watching from '../../models/channel-watching';
import serialize from '../../serializers/channel'; import { pack } from '../../models/channel';
/** /**
* Create a channel * Create a channel
@ -28,7 +28,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
}); });
// Response // Response
res(await serialize(channel)); res(await pack(channel));
// Create Watching // Create Watching
await Watching.insert({ await Watching.insert({

5
src/api/endpoints/channels/posts.ts
View File

@ -3,8 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import { default as Channel, IChannel } from '../../models/channel'; import { default as Channel, IChannel } from '../../models/channel';
import Post from '../../models/post'; import Post, { pack } from '../../models/post';
import serialize from '../../serializers/post';
/** /**
* Show a posts of a channel * Show a posts of a channel
@ -74,6 +73,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(posts.map(async (post) => res(await Promise.all(posts.map(async (post) =>
await serialize(post, user) await pack(post, user)
))); )));
}); });

5
src/api/endpoints/channels/show.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import { default as Channel, IChannel } from '../../models/channel'; import Channel, { IChannel, pack } from '../../models/channel';
import serialize from '../../serializers/channel';
/** /**
* Show a channel * Show a channel
@ -27,5 +26,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
} }
// Serialize // Serialize
res(await serialize(channel, user)); res(await pack(channel, user));
}); });

5
src/api/endpoints/drive/files.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFile from '../../models/drive-file'; import DriveFile, { pack } from '../../models/drive-file';
import serialize from '../../serializers/drive-file';
/** /**
* Get drive files * Get drive files
@ -69,6 +68,6 @@ module.exports = async (params, user, app) => {
}); });
// Serialize // Serialize
const _files = await Promise.all(files.map(file => serialize(file))); const _files = await Promise.all(files.map(file => pack(file)));
return _files; return _files;
}; };

5
src/api/endpoints/drive/files/create.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import { validateFileName } from '../../../models/drive-file'; import { validateFileName, pack } from '../../../models/drive-file';
import serialize from '../../../serializers/drive-file';
import create from '../../../common/add-file-to-drive'; import create from '../../../common/add-file-to-drive';
/** /**
@ -43,7 +42,7 @@ module.exports = async (file, params, user): Promise<any> => {
const driveFile = await create(user, file.path, name, null, folderId); const driveFile = await create(user, file.path, name, null, folderId);
// Serialize // Serialize
return serialize(driveFile); return pack(driveFile);
} catch (e) { } catch (e) {
console.error(e); console.error(e);

5
src/api/endpoints/drive/files/find.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFile from '../../../models/drive-file'; import DriveFile, { pack } from '../../../models/drive-file';
import serialize from '../../../serializers/drive-file';
/** /**
* Find a file(s) * Find a file(s)
@ -31,5 +30,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(files.map(async file => res(await Promise.all(files.map(async file =>
await serialize(file)))); await pack(file))));
}); });

5
src/api/endpoints/drive/files/show.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFile from '../../../models/drive-file'; import DriveFile, { pack } from '../../../models/drive-file';
import serialize from '../../../serializers/drive-file';
/** /**
* Show a file * Show a file
@ -29,7 +28,7 @@ module.exports = async (params, user) => {
} }
// Serialize // Serialize
const _file = await serialize(file, { const _file = await pack(file, {
detail: true detail: true
}); });

6
src/api/endpoints/drive/files/update.ts
View File

@ -3,9 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder from '../../../models/drive-folder'; import DriveFolder from '../../../models/drive-folder';
import DriveFile from '../../../models/drive-file'; import DriveFile, { validateFileName, pack } from '../../../models/drive-file';
import { validateFileName } from '../../../models/drive-file';
import serialize from '../../../serializers/drive-file';
import { publishDriveStream } from '../../../event'; import { publishDriveStream } from '../../../event';
/** /**
@ -67,7 +65,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
const fileObj = await serialize(file); const fileObj = await pack(file);
// Response // Response
res(fileObj); res(fileObj);

5
src/api/endpoints/drive/files/upload_from_url.ts
View File

@ -3,8 +3,7 @@
*/ */
import * as URL from 'url'; import * as URL from 'url';
import $ from 'cafy'; import $ from 'cafy';
import { validateFileName } from '../../../models/drive-file'; import { validateFileName, pack } from '../../../models/drive-file';
import serialize from '../../../serializers/drive-file';
import create from '../../../common/add-file-to-drive'; import create from '../../../common/add-file-to-drive';
import * as debug from 'debug'; import * as debug from 'debug';
import * as tmp from 'tmp'; import * as tmp from 'tmp';
@ -63,5 +62,5 @@ module.exports = async (params, user): Promise<any> => {
if (e) log(e.stack); if (e) log(e.stack);
}); });
return serialize(driveFile); return pack(driveFile);
}; };

5
src/api/endpoints/drive/folders.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder from '../../models/drive-folder'; import DriveFolder, { pack } from '../../models/drive-folder';
import serialize from '../../serializers/drive-folder';
/** /**
* Get drive folders * Get drive folders
@ -63,5 +62,5 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(folders.map(async folder => res(await Promise.all(folders.map(async folder =>
await serialize(folder)))); await pack(folder))));
}); });

6
src/api/endpoints/drive/folders/create.ts
View File

@ -2,9 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder from '../../../models/drive-folder'; import DriveFolder, { isValidFolderName, pack } from '../../../models/drive-folder';
import { isValidFolderName } from '../../../models/drive-folder';
import serialize from '../../../serializers/drive-folder';
import { publishDriveStream } from '../../../event'; import { publishDriveStream } from '../../../event';
/** /**
@ -47,7 +45,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
const folderObj = await serialize(folder); const folderObj = await pack(folder);
// Response // Response
res(folderObj); res(folderObj);

5
src/api/endpoints/drive/folders/find.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder from '../../../models/drive-folder'; import DriveFolder, { pack } from '../../../models/drive-folder';
import serialize from '../../../serializers/drive-folder';
/** /**
* Find a folder(s) * Find a folder(s)
@ -30,5 +29,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
res(await Promise.all(folders.map(folder => serialize(folder)))); res(await Promise.all(folders.map(folder => pack(folder))));
}); });

5
src/api/endpoints/drive/folders/show.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder from '../../../models/drive-folder'; import DriveFolder, { pack } from '../../../models/drive-folder';
import serialize from '../../../serializers/drive-folder';
/** /**
* Show a folder * Show a folder
@ -29,7 +28,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
} }
// Serialize // Serialize
res(await serialize(folder, { res(await pack(folder, {
detail: true detail: true
})); }));
}); });

6
src/api/endpoints/drive/folders/update.ts
View File

@ -2,9 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder from '../../../models/drive-folder'; import DriveFolder, { isValidFolderName, pack } from '../../../models/drive-folder';
import { isValidFolderName } from '../../../models/drive-folder';
import serialize from '../../../serializers/drive-folder';
import { publishDriveStream } from '../../../event'; import { publishDriveStream } from '../../../event';
/** /**
@ -91,7 +89,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
const folderObj = await serialize(folder); const folderObj = await pack(folder);
// Response // Response
res(folderObj); res(folderObj);

5
src/api/endpoints/drive/stream.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFile from '../../models/drive-file'; import DriveFile, { pack } from '../../models/drive-file';
import serialize from '../../serializers/drive-file';
/** /**
* Get drive stream * Get drive stream
@ -64,5 +63,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(files.map(async file => res(await Promise.all(files.map(async file =>
await serialize(file)))); await pack(file))));
}); });

7
src/api/endpoints/following/create.ts
View File

@ -2,11 +2,10 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User, { pack as packUser } from '../../models/user';
import Following from '../../models/following'; import Following from '../../models/following';
import notify from '../../common/notify'; import notify from '../../common/notify';
import event from '../../event'; import event from '../../event';
import serializeUser from '../../serializers/user';
/** /**
* Follow a user * Follow a user
@ -77,8 +76,8 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
// Publish follow event // Publish follow event
event(follower._id, 'follow', await serializeUser(followee, follower)); event(follower._id, 'follow', await packUser(followee, follower));
event(followee._id, 'followed', await serializeUser(follower, followee)); event(followee._id, 'followed', await packUser(follower, followee));
// Notify // Notify
notify(followee._id, follower._id, 'follow'); notify(followee._id, follower._id, 'follow');

5
src/api/endpoints/following/delete.ts
View File

@ -2,10 +2,9 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User, { pack as packUser } from '../../models/user';
import Following from '../../models/following'; import Following from '../../models/following';
import event from '../../event'; import event from '../../event';
import serializeUser from '../../serializers/user';
/** /**
* Unfollow a user * Unfollow a user
@ -78,5 +77,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
// Publish follow event // Publish follow event
event(follower._id, 'unfollow', await serializeUser(followee, follower)); event(follower._id, 'unfollow', await packUser(followee, follower));
}); });

5
src/api/endpoints/i.ts
View File

@ -1,8 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import User from '../models/user'; import User, { pack } from '../models/user';
import serialize from '../serializers/user';
/** /**
* Show myself * Show myself
@ -15,7 +14,7 @@ import serialize from '../serializers/user';
*/ */
module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) => { module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await serialize(user, user, { res(await pack(user, user, {
detail: true, detail: true,
includeSecrets: isSecure includeSecrets: isSecure
})); }));

4
src/api/endpoints/i/authorized_apps.ts
View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import AccessToken from '../../models/access-token'; import AccessToken from '../../models/access-token';
import serialize from '../../serializers/app'; import { pack } from '../../models/app';
/** /**
* Get authorized apps of my account * Get authorized apps of my account
@ -39,5 +39,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(tokens.map(async token => res(await Promise.all(tokens.map(async token =>
await serialize(token.app_id)))); await pack(token.app_id))));
}); });

4
src/api/endpoints/i/favorites.ts
View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Favorite from '../../models/favorite'; import Favorite from '../../models/favorite';
import serialize from '../../serializers/post'; import { pack } from '../../models/post';
/** /**
* Get followers of a user * Get followers of a user
@ -39,6 +39,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(favorites.map(async favorite => res(await Promise.all(favorites.map(async favorite =>
await serialize(favorite.post) await pack(favorite.post)
))); )));
}); });

4
src/api/endpoints/i/notifications.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import Notification from '../../models/notification'; import Notification from '../../models/notification';
import Mute from '../../models/mute'; import Mute from '../../models/mute';
import serialize from '../../serializers/notification'; import { pack } from '../../models/notification';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
import read from '../../common/read-notification'; import read from '../../common/read-notification';
@ -101,7 +101,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(notifications.map(async notification => res(await Promise.all(notifications.map(async notification =>
await serialize(notification)))); await pack(notification))));
// Mark as read all // Mark as read all
if (notifications.length > 0 && markAsRead) { if (notifications.length > 0 && markAsRead) {

4
src/api/endpoints/i/pin.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User from '../../models/user';
import Post from '../../models/post'; import Post from '../../models/post';
import serialize from '../../serializers/user'; import { pack } from '../../models/user';
/** /**
* Pin post * Pin post
@ -35,7 +35,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
const iObj = await serialize(user, user, { const iObj = await pack(user, user, {
detail: true detail: true
}); });

5
src/api/endpoints/i/signin_history.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Signin from '../../models/signin'; import Signin, { pack } from '../../models/signin';
import serialize from '../../serializers/signin';
/** /**
* Get signin history of my account * Get signin history of my account
@ -58,5 +57,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(history.map(async record => res(await Promise.all(history.map(async record =>
await serialize(record)))); await pack(record))));
}); });

6
src/api/endpoints/i/update.ts
View File

@ -2,9 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../models/user';
import { isValidName, isValidDescription, isValidLocation, isValidBirthday } from '../../models/user';
import serialize from '../../serializers/user';
import event from '../../event'; import event from '../../event';
import config from '../../../conf'; import config from '../../../conf';
@ -65,7 +63,7 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
}); });
// Serialize // Serialize
const iObj = await serialize(user, user, { const iObj = await pack(user, user, {
detail: true, detail: true,
includeSecrets: isSecure includeSecrets: isSecure
}); });

4
src/api/endpoints/messaging/history.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import History from '../../models/messaging-history'; import History from '../../models/messaging-history';
import Mute from '../../models/mute'; import Mute from '../../models/mute';
import serialize from '../../serializers/messaging-message'; import { pack } from '../../models/messaging-message';
/** /**
* Show messaging history * Show messaging history
@ -39,5 +39,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(history.map(async h => res(await Promise.all(history.map(async h =>
await serialize(h.message, user)))); await pack(h.message, user))));
}); });

4
src/api/endpoints/messaging/messages.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import Message from '../../models/messaging-message'; import Message from '../../models/messaging-message';
import User from '../../models/user'; import User from '../../models/user';
import serialize from '../../serializers/messaging-message'; import { pack } from '../../models/messaging-message';
import read from '../../common/read-messaging-message'; import read from '../../common/read-messaging-message';
/** /**
@ -87,7 +87,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(messages.map(async message => res(await Promise.all(messages.map(async message =>
await serialize(message, user, { await pack(message, user, {
populateRecipient: false populateRecipient: false
})))); }))));

4
src/api/endpoints/messaging/messages/create.ts
View File

@ -8,7 +8,7 @@ import History from '../../../models/messaging-history';
import User from '../../../models/user'; import User from '../../../models/user';
import Mute from '../../../models/mute'; import Mute from '../../../models/mute';
import DriveFile from '../../../models/drive-file'; import DriveFile from '../../../models/drive-file';
import serialize from '../../../serializers/messaging-message'; import { pack } from '../../../models/messaging-message';
import publishUserStream from '../../../event'; import publishUserStream from '../../../event';
import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../event'; import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../event';
import config from '../../../../conf'; import config from '../../../../conf';
@ -79,7 +79,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
const messageObj = await serialize(message); const messageObj = await pack(message);
// Reponse // Reponse
res(messageObj); res(messageObj);

4
src/api/endpoints/mute/list.ts
View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Mute from '../../models/mute'; import Mute from '../../models/mute';
import serialize from '../../serializers/user'; import { pack } from '../../models/user';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
/** /**
@ -63,7 +63,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
const users = await Promise.all(mutes.map(async m => const users = await Promise.all(mutes.map(async m =>
await serialize(m.mutee_id, me, { detail: true }))); await pack(m.mutee_id, me, { detail: true })));
// Response // Response
res({ res({

5
src/api/endpoints/my/apps.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import App from '../../models/app'; import App, { pack } from '../../models/app';
import serialize from '../../serializers/app';
/** /**
* Get my apps * Get my apps
@ -37,5 +36,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Reply // Reply
res(await Promise.all(apps.map(async app => res(await Promise.all(apps.map(async app =>
await serialize(app)))); await pack(app))));
}); });

5
src/api/endpoints/posts.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../models/post'; import Post, { pack } from '../models/post';
import serialize from '../serializers/post';
/** /**
* Lists all posts * Lists all posts
@ -85,5 +84,5 @@ module.exports = (params) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
res(await Promise.all(posts.map(async post => await serialize(post)))); res(await Promise.all(posts.map(async post => await pack(post))));
}); });

5
src/api/endpoints/posts/context.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post, { pack } from '../../models/post';
import serialize from '../../serializers/post';
/** /**
* Show a context of a post * Show a context of a post
@ -60,5 +59,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(context.map(async post => res(await Promise.all(context.map(async post =>
await serialize(post, user)))); await pack(post, user))));
}); });

4
src/api/endpoints/posts/create.ts
View File

@ -12,7 +12,7 @@ import Mute from '../../models/mute';
import DriveFile from '../../models/drive-file'; import DriveFile from '../../models/drive-file';
import Watching from '../../models/post-watching'; import Watching from '../../models/post-watching';
import ChannelWatching from '../../models/channel-watching'; import ChannelWatching from '../../models/channel-watching';
import serialize from '../../serializers/post'; import { pack } from '../../models/post';
import notify from '../../common/notify'; import notify from '../../common/notify';
import watch from '../../common/watch-post'; import watch from '../../common/watch-post';
import event, { pushSw, publishChannelStream } from '../../event'; import event, { pushSw, publishChannelStream } from '../../event';
@ -224,7 +224,7 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
}); });
// Serialize // Serialize
const postObj = await serialize(post); const postObj = await pack(post);
// Reponse // Reponse
res({ res({

4
src/api/endpoints/posts/mentions.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post from '../../models/post';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
import serialize from '../../serializers/post'; import { pack } from '../../models/post';
/** /**
* Get mentions of myself * Get mentions of myself
@ -73,6 +73,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(mentions.map(async mention => res(await Promise.all(mentions.map(async mention =>
await serialize(mention, user) await pack(mention, user)
))); )));
}); });

5
src/api/endpoints/posts/polls/recommendation.ts
View File

@ -3,8 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Vote from '../../../models/poll-vote'; import Vote from '../../../models/poll-vote';
import Post from '../../../models/post'; import Post, { pack } from '../../../models/post';
import serialize from '../../../serializers/post';
/** /**
* Get recommended polls * Get recommended polls
@ -56,5 +55,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(posts.map(async post => res(await Promise.all(posts.map(async post =>
await serialize(post, user, { detail: true })))); await pack(post, user, { detail: true }))));
}); });

5
src/api/endpoints/posts/reactions.ts
View File

@ -3,8 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post from '../../models/post';
import Reaction from '../../models/post-reaction'; import Reaction, { pack } from '../../models/post-reaction';
import serialize from '../../serializers/post-reaction';
/** /**
* Show reactions of a post * Show reactions of a post
@ -54,5 +53,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(reactions.map(async reaction => res(await Promise.all(reactions.map(async reaction =>
await serialize(reaction, user)))); await pack(reaction, user))));
}); });

9
src/api/endpoints/posts/reactions/create.ts
View File

@ -3,13 +3,12 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Reaction from '../../../models/post-reaction'; import Reaction from '../../../models/post-reaction';
import Post from '../../../models/post'; import Post, { pack as packPost } from '../../../models/post';
import { pack as packUser } from '../../../models/user';
import Watching from '../../../models/post-watching'; import Watching from '../../../models/post-watching';
import notify from '../../../common/notify'; import notify from '../../../common/notify';
import watch from '../../../common/watch-post'; import watch from '../../../common/watch-post';
import { publishPostStream, pushSw } from '../../../event'; import { publishPostStream, pushSw } from '../../../event';
import serializePost from '../../../serializers/post';
import serializeUser from '../../../serializers/user';
/** /**
* React to a post * React to a post
@ -90,8 +89,8 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}); });
pushSw(post.user_id, 'reaction', { pushSw(post.user_id, 'reaction', {
user: await serializeUser(user, post.user_id), user: await packUser(user, post.user_id),
post: await serializePost(post, post.user_id), post: await packPost(post, post.user_id),
reaction: reaction reaction: reaction
}); });

5
src/api/endpoints/posts/replies.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post, { pack } from '../../models/post';
import serialize from '../../serializers/post';
/** /**
* Show a replies of a post * Show a replies of a post
@ -50,5 +49,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(replies.map(async post => res(await Promise.all(replies.map(async post =>
await serialize(post, user)))); await pack(post, user))));
}); });

5
src/api/endpoints/posts/reposts.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post, { pack } from '../../models/post';
import serialize from '../../serializers/post';
/** /**
* Show a reposts of a post * Show a reposts of a post
@ -70,5 +69,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(reposts.map(async post => res(await Promise.all(reposts.map(async post =>
await serialize(post, user)))); await pack(post, user))));
}); });

4
src/api/endpoints/posts/search.ts
View File

@ -7,7 +7,7 @@ import Post from '../../models/post';
import User from '../../models/user'; import User from '../../models/user';
import Mute from '../../models/mute'; import Mute from '../../models/mute';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
import serialize from '../../serializers/post'; import { pack } from '../../models/post';
/** /**
* Search a post * Search a post
@ -351,5 +351,5 @@ async function search(
// Serialize // Serialize
res(await Promise.all(posts.map(async post => res(await Promise.all(posts.map(async post =>
await serialize(post, me)))); await pack(post, me))));
} }

5
src/api/endpoints/posts/show.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post, { pack } from '../../models/post';
import serialize from '../../serializers/post';
/** /**
* Show a post * Show a post
@ -27,7 +26,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
} }
// Serialize // Serialize
res(await serialize(post, user, { res(await pack(post, user, {
detail: true detail: true
})); }));
}); });

4
src/api/endpoints/posts/timeline.ts
View File

@ -7,7 +7,7 @@ import Post from '../../models/post';
import Mute from '../../models/mute'; import Mute from '../../models/mute';
import ChannelWatching from '../../models/channel-watching'; import ChannelWatching from '../../models/channel-watching';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
import serialize from '../../serializers/post'; import { pack } from '../../models/post';
/** /**
* Get timeline of myself * Get timeline of myself
@ -128,5 +128,5 @@ module.exports = async (params, user, app) => {
}); });
// Serialize // Serialize
return await Promise.all(timeline.map(post => serialize(post, user))); return await Promise.all(timeline.map(post => pack(post, user)));
}; };

5
src/api/endpoints/posts/trend.ts
View File

@ -3,8 +3,7 @@
*/ */
const ms = require('ms'); const ms = require('ms');
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post, { pack } from '../../models/post';
import serialize from '../../serializers/post';
/** /**
* Get trend posts * Get trend posts
@ -76,5 +75,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(posts.map(async post => res(await Promise.all(posts.map(async post =>
await serialize(post, user, { detail: true })))); await pack(post, user, { detail: true }))));
}); });

5
src/api/endpoints/users.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../models/user'; import User, { pack } from '../models/user';
import serialize from '../serializers/user';
/** /**
* Lists all users * Lists all users
@ -55,5 +54,5 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(users.map(async user => res(await Promise.all(users.map(async user =>
await serialize(user, me)))); await pack(user, me))));
}); });

4
src/api/endpoints/users/followers.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User from '../../models/user';
import Following from '../../models/following'; import Following from '../../models/following';
import serialize from '../../serializers/user'; import { pack } from '../../models/user';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
/** /**
@ -82,7 +82,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
const users = await Promise.all(following.map(async f => const users = await Promise.all(following.map(async f =>
await serialize(f.follower_id, me, { detail: true }))); await pack(f.follower_id, me, { detail: true })));
// Response // Response
res({ res({

4
src/api/endpoints/users/following.ts
View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User from '../../models/user';
import Following from '../../models/following'; import Following from '../../models/following';
import serialize from '../../serializers/user'; import { pack } from '../../models/user';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
/** /**
@ -82,7 +82,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
const users = await Promise.all(following.map(async f => const users = await Promise.all(following.map(async f =>
await serialize(f.followee_id, me, { detail: true }))); await pack(f.followee_id, me, { detail: true })));
// Response // Response
res({ res({

5
src/api/endpoints/users/get_frequently_replied_users.ts
View File

@ -3,8 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post from '../../models/post';
import User from '../../models/user'; import User, { pack } from '../../models/user';
import serialize from '../../serializers/user';
module.exports = (params, me) => new Promise(async (res, rej) => { module.exports = (params, me) => new Promise(async (res, rej) => {
// Get 'user_id' parameter // Get 'user_id' parameter
@ -91,7 +90,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Make replies object (includes weights) // Make replies object (includes weights)
const repliesObj = await Promise.all(topRepliedUsers.map(async (user) => ({ const repliesObj = await Promise.all(topRepliedUsers.map(async (user) => ({
user: await serialize(user, me, { detail: true }), user: await pack(user, me, { detail: true }),
weight: repliedUsers[user] / peak weight: repliedUsers[user] / peak
}))); })));

5
src/api/endpoints/users/posts.ts
View File

@ -2,9 +2,8 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import Post from '../../models/post'; import Post, { pack } from '../../models/post';
import User from '../../models/user'; import User from '../../models/user';
import serialize from '../../serializers/post';
/** /**
* Get posts of a user * Get posts of a user
@ -124,6 +123,6 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(posts.map(async (post) => res(await Promise.all(posts.map(async (post) =>
await serialize(post, me) await pack(post, me)
))); )));
}); });

5
src/api/endpoints/users/recommendation.ts
View File

@ -3,8 +3,7 @@
*/ */
const ms = require('ms'); const ms = require('ms');
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User, { pack } from '../../models/user';
import serialize from '../../serializers/user';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
/** /**
@ -44,5 +43,5 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(users.map(async user => res(await Promise.all(users.map(async user =>
await serialize(user, me, { detail: true })))); await pack(user, me, { detail: true }))));
}); });

7
src/api/endpoints/users/search.ts
View File

@ -3,8 +3,7 @@
*/ */
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User, { pack } from '../../models/user';
import serialize from '../../serializers/user';
import config from '../../../conf'; import config from '../../../conf';
const escapeRegexp = require('escape-regexp'); const escapeRegexp = require('escape-regexp');
@ -52,7 +51,7 @@ async function byNative(res, rej, me, query, offset, max) {
// Serialize // Serialize
res(await Promise.all(users.map(async user => res(await Promise.all(users.map(async user =>
await serialize(user, me, { detail: true })))); await pack(user, me, { detail: true }))));
} }
// Search by Elasticsearch // Search by Elasticsearch
@ -94,6 +93,6 @@ async function byElasticsearch(res, rej, me, query, offset, max) {
// Serialize // Serialize
res(await Promise.all(users.map(async user => res(await Promise.all(users.map(async user =>
await serialize(user, me, { detail: true })))); await pack(user, me, { detail: true }))));
}); });
} }

5
src/api/endpoints/users/search_by_username.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User, { pack } from '../../models/user';
import serialize from '../../serializers/user';
/** /**
* Search a user by username * Search a user by username
@ -35,5 +34,5 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Serialize // Serialize
res(await Promise.all(users.map(async user => res(await Promise.all(users.map(async user =>
await serialize(user, me, { detail: true })))); await pack(user, me, { detail: true }))));
}); });

5
src/api/endpoints/users/show.ts
View File

@ -2,8 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../../models/user'; import User, { pack } from '../../models/user';
import serialize from '../../serializers/user';
/** /**
* Show a user * Show a user
@ -41,7 +40,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
} }
// Send response // Send response
res(await serialize(user, me, { res(await pack(user, me, {
detail: true detail: true
})); }));
}); });

96
src/api/models/app.ts
View File

@ -1,13 +1,97 @@
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import AccessToken from './access-token';
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import config from '../../conf';
const collection = db.get('apps'); const App = db.get<IApp>('apps');
App.createIndex('name_id');
App.createIndex('name_id_lower');
App.createIndex('secret');
export default App;
(collection as any).createIndex('name_id'); // fuck type definition export type IApp = {
(collection as any).createIndex('name_id_lower'); // fuck type definition _id: mongo.ObjectID;
(collection as any).createIndex('secret'); // fuck type definition created_at: Date;
user_id: mongo.ObjectID;
export default collection as any; // fuck type definition secret: string;
};
export function isValidNameId(nameId: string): boolean { export function isValidNameId(nameId: string): boolean {
return typeof nameId == 'string' && /^[a-zA-Z0-9\-]{3,30}$/.test(nameId); return typeof nameId == 'string' && /^[a-zA-Z0-9\-]{3,30}$/.test(nameId);
} }
/**
* Pack an app for API response
*
* @param {any} app
* @param {any} me?
* @param {any} options?
* @return {Promise<any>}
*/
export const pack = (
app: any,
me?: any,
options?: {
includeSecret?: boolean,
includeProfileImageIds?: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = options || {
includeSecret: false,
includeProfileImageIds: false
};
let _app: any;
// Populate the app if 'app' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(app)) {
_app = await App.findOne({
_id: app
});
} else if (typeof app === 'string') {
_app = await App.findOne({
_id: new mongo.ObjectID(app)
});
} else {
_app = deepcopy(app);
}
// Me
if (me && !mongo.ObjectID.prototype.isPrototypeOf(me)) {
if (typeof me === 'string') {
me = new mongo.ObjectID(me);
} else {
me = me._id;
}
}
// Rename _id to id
_app.id = _app._id;
delete _app._id;
delete _app.name_id_lower;
// Visible by only owner
if (!opts.includeSecret) {
delete _app.secret;
}
_app.icon_url = _app.icon != null
? `${config.drive_url}/${_app.icon}`
: `${config.drive_url}/app-default.jpg`;
if (me) {
// 既に連携しているか
const exist = await AccessToken.count({
app_id: _app.id,
user_id: me,
}, {
limit: 1
});
_app.is_authorized = exist === 1;
}
resolve(_app);
});

44
src/api/models/auth-session.ts
View File

@ -1,3 +1,45 @@
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import { pack as packApp } from './app';
export default db.get('auth_sessions') as any; // fuck type definition const AuthSession = db.get('auth_sessions');
export default AuthSession;
export interface IAuthSession {
_id: mongo.ObjectID;
}
/**
* Pack an auth session for API response
*
* @param {any} session
* @param {any} me?
* @return {Promise<any>}
*/
export const pack = (
session: any,
me?: any
) => new Promise<any>(async (resolve, reject) => {
let _session: any;
// TODO: Populate session if it ID
_session = deepcopy(session);
// Me
if (me && !mongo.ObjectID.prototype.isPrototypeOf(me)) {
if (typeof me === 'string') {
me = new mongo.ObjectID(me);
} else {
me = me._id;
}
}
delete _session._id;
// Populate app
_session.app = await packApp(_session.app_id, me);
resolve(_session);
});

66
src/api/models/channel.ts
View File

@ -1,9 +1,11 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import { IUser } from './user';
import Watching from './channel-watching';
import db from '../../db/mongodb'; import db from '../../db/mongodb';
const collection = db.get('channels'); const Channel = db.get<IChannel>('channels');
export default Channel;
export default collection as any; // fuck type definition
export type IChannel = { export type IChannel = {
_id: mongo.ObjectID; _id: mongo.ObjectID;
@ -12,3 +14,61 @@ export type IChannel = {
user_id: mongo.ObjectID; user_id: mongo.ObjectID;
index: number; index: number;
}; };
/**
* Pack a channel for API response
*
* @param channel target
* @param me? serializee
* @return response
*/
export const pack = (
channel: string | mongo.ObjectID | IChannel,
me?: string | mongo.ObjectID | IUser
) => new Promise<any>(async (resolve, reject) => {
let _channel: any;
// Populate the channel if 'channel' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(channel)) {
_channel = await Channel.findOne({
_id: channel
});
} else if (typeof channel === 'string') {
_channel = await Channel.findOne({
_id: new mongo.ObjectID(channel)
});
} else {
_channel = deepcopy(channel);
}
// Rename _id to id
_channel.id = _channel._id;
delete _channel._id;
// Remove needless properties
delete _channel.user_id;
// Me
const meId: mongo.ObjectID = me
? mongo.ObjectID.prototype.isPrototypeOf(me)
? me as mongo.ObjectID
: typeof me === 'string'
? new mongo.ObjectID(me)
: (me as IUser)._id
: null;
if (me) {
//#region Watchしているかどうか
const watch = await Watching.findOne({
user_id: meId,
channel_id: _channel.id,
deleted_at: { $exists: false }
});
_channel.is_watching = watch !== null;
//#endregion
}
resolve(_channel);
});

91
src/api/models/drive-file.ts
View File

@ -1,9 +1,12 @@
import * as mongodb from 'mongodb'; import * as mongodb from 'mongodb';
import deepcopy = require('deepcopy');
import { pack as packFolder } from './drive-folder';
import config from '../../conf';
import monkDb, { nativeDbConn } from '../../db/mongodb'; import monkDb, { nativeDbConn } from '../../db/mongodb';
const collection = monkDb.get('drive_files.files'); const DriveFile = monkDb.get<IDriveFile>('drive_files.files');
export default collection as any; // fuck type definition export default DriveFile;
const getGridFSBucket = async (): Promise<mongodb.GridFSBucket> => { const getGridFSBucket = async (): Promise<mongodb.GridFSBucket> => {
const db = await nativeDbConn(); const db = await nativeDbConn();
@ -15,6 +18,19 @@ const getGridFSBucket = async (): Promise<mongodb.GridFSBucket> => {
export { getGridFSBucket }; export { getGridFSBucket };
export type IDriveFile = {
_id: mongodb.ObjectID;
uploadDate: Date;
md5: string;
filename: string;
contentType: string;
metadata: {
properties: any;
user_id: mongodb.ObjectID;
folder_id: mongodb.ObjectID;
}
};
export function validateFileName(name: string): boolean { export function validateFileName(name: string): boolean {
return ( return (
(name.trim().length > 0) && (name.trim().length > 0) &&
@ -24,3 +40,74 @@ export function validateFileName(name: string): boolean {
(name.indexOf('..') === -1) (name.indexOf('..') === -1)
); );
} }
/**
* Pack a drive file for API response
*
* @param {any} file
* @param {any} options?
* @return {Promise<any>}
*/
export const pack = (
file: any,
options?: {
detail: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = Object.assign({
detail: false
}, options);
let _file: any;
// Populate the file if 'file' is ID
if (mongodb.ObjectID.prototype.isPrototypeOf(file)) {
_file = await DriveFile.findOne({
_id: file
});
} else if (typeof file === 'string') {
_file = await DriveFile.findOne({
_id: new mongodb.ObjectID(file)
});
} else {
_file = deepcopy(file);
}
if (!_file) return reject('invalid file arg.');
// rendered target
let _target: any = {};
_target.id = _file._id;
_target.created_at = _file.uploadDate;
_target.name = _file.filename;
_target.type = _file.contentType;
_target.datasize = _file.length;
_target.md5 = _file.md5;
_target = Object.assign(_target, _file.metadata);
_target.url = `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
if (_target.properties == null) _target.properties = {};
if (opts.detail) {
if (_target.folder_id) {
// Populate folder
_target.folder = await packFolder(_target.folder_id, {
detail: true
});
}
/*
if (_target.tags) {
// Populate tags
_target.tags = await _target.tags.map(async (tag: any) =>
await serializeDriveTag(tag)
);
}
*/
}
resolve(_target);
});

69
src/api/models/drive-folder.ts
View File

@ -1,6 +1,18 @@
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import DriveFile from './drive-file';
export default db.get('drive_folders') as any; // fuck type definition const DriveFolder = db.get<IDriveFolder>('drive_folders');
export default DriveFolder;
export type IDriveFolder = {
_id: mongo.ObjectID;
created_at: Date;
name: string;
user_id: mongo.ObjectID;
parent_id: mongo.ObjectID;
};
export function isValidFolderName(name: string): boolean { export function isValidFolderName(name: string): boolean {
return ( return (
@ -8,3 +20,58 @@ export function isValidFolderName(name: string): boolean {
(name.length <= 200) (name.length <= 200)
); );
} }
/**
* Pack a drive folder for API response
*
* @param {any} folder
* @param {any} options?
* @return {Promise<any>}
*/
export const pack = (
folder: any,
options?: {
detail: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = Object.assign({
detail: false
}, options);
let _folder: any;
// Populate the folder if 'folder' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(folder)) {
_folder = await DriveFolder.findOne({ _id: folder });
} else if (typeof folder === 'string') {
_folder = await DriveFolder.findOne({ _id: new mongo.ObjectID(folder) });
} else {
_folder = deepcopy(folder);
}
// Rename _id to id
_folder.id = _folder._id;
delete _folder._id;
if (opts.detail) {
const childFoldersCount = await DriveFolder.count({
parent_id: _folder.id
});
const childFilesCount = await DriveFile.count({
'metadata.folder_id': _folder.id
});
_folder.folders_count = childFoldersCount;
_folder.files_count = childFilesCount;
}
if (opts.detail && _folder.parent_id) {
// Populate parent folder
_folder.parent = await pack(_folder.parent_id, {
detail: true
});
}
resolve(_folder);
});

71
src/api/models/messaging-message.ts
View File

@ -1,12 +1,81 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import { pack as packUser } from './user';
import { pack as packFile } from './drive-file';
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import parse from '../common/text';
export default db.get('messaging_messages') as any; // fuck type definition const MessagingMessage = db.get<IMessagingMessage>('messaging_messages');
export default MessagingMessage;
export interface IMessagingMessage { export interface IMessagingMessage {
_id: mongo.ObjectID; _id: mongo.ObjectID;
created_at: Date;
text: string;
user_id: mongo.ObjectID;
recipient_id: mongo.ObjectID;
is_read: boolean;
} }
export function isValidText(text: string): boolean { export function isValidText(text: string): boolean {
return text.length <= 1000 && text.trim() != ''; return text.length <= 1000 && text.trim() != '';
} }
/**
* Pack a messaging message for API response
*
* @param {any} message
* @param {any} me?
* @param {any} options?
* @return {Promise<any>}
*/
export const pack = (
message: any,
me?: any,
options?: {
populateRecipient: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = options || {
populateRecipient: true
};
let _message: any;
// Populate the message if 'message' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(message)) {
_message = await MessagingMessage.findOne({
_id: message
});
} else if (typeof message === 'string') {
_message = await MessagingMessage.findOne({
_id: new mongo.ObjectID(message)
});
} else {
_message = deepcopy(message);
}
// Rename _id to id
_message.id = _message._id;
delete _message._id;
// Parse text
if (_message.text) {
_message.ast = parse(_message.text);
}
// Populate user
_message.user = await packUser(_message.user_id, me);
if (_message.file) {
// Populate file
_message.file = await packFile(_message.file_id);
}
if (opts.populateRecipient) {
// Populate recipient
_message.recipient = await packUser(_message.recipient_id, me);
}
resolve(_message);
});

64
src/api/models/notification.ts
View File

@ -1,8 +1,11 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import { IUser } from './user'; import { IUser, pack as packUser } from './user';
import { pack as packPost } from './post';
export default db.get('notifications') as any; // fuck type definition const Notification = db.get<INotification>('notifications');
export default Notification;
export interface INotification { export interface INotification {
_id: mongo.ObjectID; _id: mongo.ObjectID;
@ -45,3 +48,60 @@ export interface INotification {
*/ */
is_read: Boolean; is_read: Boolean;
} }
/**
* Pack a notification for API response
*
* @param {any} notification
* @return {Promise<any>}
*/
export const pack = (notification: any) => new Promise<any>(async (resolve, reject) => {
let _notification: any;
// Populate the notification if 'notification' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(notification)) {
_notification = await Notification.findOne({
_id: notification
});
} else if (typeof notification === 'string') {
_notification = await Notification.findOne({
_id: new mongo.ObjectID(notification)
});
} else {
_notification = deepcopy(notification);
}
// Rename _id to id
_notification.id = _notification._id;
delete _notification._id;
// Rename notifier_id to user_id
_notification.user_id = _notification.notifier_id;
delete _notification.notifier_id;
const me = _notification.notifiee_id;
delete _notification.notifiee_id;
// Populate notifier
_notification.user = await packUser(_notification.user_id, me);
switch (_notification.type) {
case 'follow':
// nope
break;
case 'mention':
case 'reply':
case 'repost':
case 'quote':
case 'reaction':
case 'poll_vote':
// Populate post
_notification.post = await packPost(_notification.post_id, me);
break;
default:
console.error(`Unknown type: ${_notification.type}`);
break;
}
resolve(_notification);
});

50
src/api/models/post-reaction.ts
View File

@ -1,3 +1,51 @@
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import Reaction from './post-reaction';
import { pack as packUser } from './user';
export default db.get('post_reactions') as any; // fuck type definition const PostReaction = db.get<IPostReaction>('post_reactions');
export default PostReaction;
export interface IPostReaction {
_id: mongo.ObjectID;
created_at: Date;
deleted_at: Date;
reaction: string;
}
/**
* Pack a reaction for API response
*
* @param {any} reaction
* @param {any} me?
* @return {Promise<any>}
*/
export const pack = (
reaction: any,
me?: any
) => new Promise<any>(async (resolve, reject) => {
let _reaction: any;
// Populate the reaction if 'reaction' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(reaction)) {
_reaction = await Reaction.findOne({
_id: reaction
});
} else if (typeof reaction === 'string') {
_reaction = await Reaction.findOne({
_id: new mongo.ObjectID(reaction)
});
} else {
_reaction = deepcopy(reaction);
}
// Rename _id to id
_reaction.id = _reaction._id;
delete _reaction._id;
// Populate user
_reaction.user = await packUser(_reaction.user_id, me);
resolve(_reaction);
});

193
src/api/models/post.ts
View File

@ -1,8 +1,18 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import rap from '@prezzemolo/rap';
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import { IUser, pack as packUser } from './user';
import { pack as packApp } from './app';
import { pack as packChannel } from './channel';
import Vote from './poll-vote';
import Reaction from './post-reaction';
import { pack as packFile } from './drive-file';
import parse from '../common/text';
export default db.get('posts') as any; // fuck type definition const Post = db.get<IPost>('posts');
export default Post;
export function isValidText(text: string): boolean { export function isValidText(text: string): boolean {
return text.length <= 1000 && text.trim() != ''; return text.length <= 1000 && text.trim() != '';
@ -15,8 +25,185 @@ export type IPost = {
media_ids: mongo.ObjectID[]; media_ids: mongo.ObjectID[];
reply_id: mongo.ObjectID; reply_id: mongo.ObjectID;
repost_id: mongo.ObjectID; repost_id: mongo.ObjectID;
poll: {}; // todo poll: any; // todo
text: string; text: string;
user_id: mongo.ObjectID; user_id: mongo.ObjectID;
app_id: mongo.ObjectID; app_id: mongo.ObjectID;
category: string;
is_category_verified: boolean;
};
/**
* Pack a post for API response
*
* @param post target
* @param me? serializee
* @param options? serialize options
* @return response
*/
export const pack = async (
post: string | mongo.ObjectID | IPost,
me?: string | mongo.ObjectID | IUser,
options?: {
detail: boolean
}
) => {
const opts = options || {
detail: true,
};
// Me
const meId: mongo.ObjectID = me
? mongo.ObjectID.prototype.isPrototypeOf(me)
? me as mongo.ObjectID
: typeof me === 'string'
? new mongo.ObjectID(me)
: (me as IUser)._id
: null;
let _post: any;
// Populate the post if 'post' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(post)) {
_post = await Post.findOne({
_id: post
});
} else if (typeof post === 'string') {
_post = await Post.findOne({
_id: new mongo.ObjectID(post)
});
} else {
_post = deepcopy(post);
}
if (!_post) throw 'invalid post arg.';
const id = _post._id;
// Rename _id to id
_post.id = _post._id;
delete _post._id;
delete _post.mentions;
// Parse text
if (_post.text) {
_post.ast = parse(_post.text);
}
// Populate user
_post.user = packUser(_post.user_id, meId);
// Populate app
if (_post.app_id) {
_post.app = packApp(_post.app_id);
}
// Populate channel
if (_post.channel_id) {
_post.channel = packChannel(_post.channel_id);
}
// Populate media
if (_post.media_ids) {
_post.media = Promise.all(_post.media_ids.map(fileId =>
packFile(fileId)
));
}
// When requested a detailed post data
if (opts.detail) {
// Get previous post info
_post.prev = (async () => {
const prev = await Post.findOne({
user_id: _post.user_id,
_id: {
$lt: id
}
}, {
fields: {
_id: true
},
sort: {
_id: -1
}
});
return prev ? prev._id : null;
})();
// Get next post info
_post.next = (async () => {
const next = await Post.findOne({
user_id: _post.user_id,
_id: {
$gt: id
}
}, {
fields: {
_id: true
},
sort: {
_id: 1
}
});
return next ? next._id : null;
})();
if (_post.reply_id) {
// Populate reply to post
_post.reply = pack(_post.reply_id, meId, {
detail: false
});
}
if (_post.repost_id) {
// Populate repost
_post.repost = pack(_post.repost_id, meId, {
detail: _post.text == null
});
}
// Poll
if (meId && _post.poll) {
_post.poll = (async (poll) => {
const vote = await Vote
.findOne({
user_id: meId,
post_id: id
});
if (vote != null) {
const myChoice = poll.choices
.filter(c => c.id == vote.choice)[0];
myChoice.is_voted = true;
}
return poll;
})(_post.poll);
}
// Fetch my reaction
if (meId) {
_post.my_reaction = (async () => {
const reaction = await Reaction
.findOne({
user_id: meId,
post_id: id,
deleted_at: { $exists: false }
});
if (reaction) {
return reaction.reaction;
}
return null;
})();
}
}
// resolve promises in _post object
_post = await rap(_post);
return _post;
}; };

28
src/api/models/signin.ts
View File

@ -1,3 +1,29 @@
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import db from '../../db/mongodb'; import db from '../../db/mongodb';
export default db.get('signin') as any; // fuck type definition const Signin = db.get<ISignin>('signin');
export default Signin;
export interface ISignin {
_id: mongo.ObjectID;
}
/**
* Pack a signin record for API response
*
* @param {any} record
* @return {Promise<any>}
*/
export const pack = (
record: any
) => new Promise<any>(async (resolve, reject) => {
const _record = deepcopy(record);
// Rename _id to id
_record.id = _record._id;
delete _record._id;
resolve(_record);
});

197
src/api/models/user.ts
View File

@ -1,14 +1,19 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import rap from '@prezzemolo/rap';
import db from '../../db/mongodb'; import db from '../../db/mongodb';
import { IPost } from './post'; import { IPost, pack as packPost } from './post';
import Following from './following';
import Mute from './mute';
import getFriends from '../common/get-friends';
import config from '../../conf';
const collection = db.get('users'); const User = db.get<IUser>('users');
(collection as any).createIndex('username'); // fuck type definition User.createIndex('username');
(collection as any).createIndex('token'); // fuck type definition User.createIndex('token');
export default collection as any; // fuck type definition export default User;
export function validateUsername(username: string): boolean { export function validateUsername(username: string): boolean {
return typeof username == 'string' && /^[a-zA-Z0-9\-]{3,20}$/.test(username); return typeof username == 'string' && /^[a-zA-Z0-9\-]{3,20}$/.test(username);
@ -37,6 +42,7 @@ export function isValidBirthday(birthday: string): boolean {
export type IUser = { export type IUser = {
_id: mongo.ObjectID; _id: mongo.ObjectID;
created_at: Date; created_at: Date;
deleted_at: Date;
email: string; email: string;
followers_count: number; followers_count: number;
following_count: number; following_count: number;
@ -83,3 +89,182 @@ export function init(user): IUser {
user.pinned_post_id = new mongo.ObjectID(user.pinned_post_id); user.pinned_post_id = new mongo.ObjectID(user.pinned_post_id);
return user; return user;
} }
/**
* Pack a user for API response
*
* @param user target
* @param me? serializee
* @param options? serialize options
* @return Packed user
*/
export const pack = (
user: string | mongo.ObjectID | IUser,
me?: string | mongo.ObjectID | IUser,
options?: {
detail?: boolean,
includeSecrets?: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = Object.assign({
detail: false,
includeSecrets: false
}, options);
let _user: any;
const fields = opts.detail ? {
settings: false
} : {
settings: false,
client_settings: false,
profile: false,
keywords: false,
domains: false
};
// Populate the user if 'user' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(user)) {
_user = await User.findOne({
_id: user
}, { fields });
} else if (typeof user === 'string') {
_user = await User.findOne({
_id: new mongo.ObjectID(user)
}, { fields });
} else {
_user = deepcopy(user);
}
if (!_user) return reject('invalid user arg.');
// Me
const meId: mongo.ObjectID = me
? mongo.ObjectID.prototype.isPrototypeOf(me)
? me as mongo.ObjectID
: typeof me === 'string'
? new mongo.ObjectID(me)
: (me as IUser)._id
: null;
// Rename _id to id
_user.id = _user._id;
delete _user._id;
// Remove needless properties
delete _user.latest_post;
// Remove private properties
delete _user.password;
delete _user.token;
delete _user.two_factor_temp_secret;
delete _user.two_factor_secret;
delete _user.username_lower;
if (_user.twitter) {
delete _user.twitter.access_token;
delete _user.twitter.access_token_secret;
}
delete _user.line;
// Visible via only the official client
if (!opts.includeSecrets) {
delete _user.email;
delete _user.client_settings;
}
if (!opts.detail) {
delete _user.two_factor_enabled;
}
_user.avatar_url = _user.avatar_id != null
? `${config.drive_url}/${_user.avatar_id}`
: `${config.drive_url}/default-avatar.jpg`;
_user.banner_url = _user.banner_id != null
? `${config.drive_url}/${_user.banner_id}`
: null;
if (!meId || !meId.equals(_user.id) || !opts.detail) {
delete _user.avatar_id;
delete _user.banner_id;
delete _user.drive_capacity;
}
if (meId && !meId.equals(_user.id)) {
// Whether the user is following
_user.is_following = (async () => {
const follow = await Following.findOne({
follower_id: meId,
followee_id: _user.id,
deleted_at: { $exists: false }
});
return follow !== null;
})();
// Whether the user is followed
_user.is_followed = (async () => {
const follow2 = await Following.findOne({
follower_id: _user.id,
followee_id: meId,
deleted_at: { $exists: false }
});
return follow2 !== null;
})();
// Whether the user is muted
_user.is_muted = (async () => {
const mute = await Mute.findOne({
muter_id: meId,
mutee_id: _user.id,
deleted_at: { $exists: false }
});
return mute !== null;
})();
}
if (opts.detail) {
if (_user.pinned_post_id) {
// Populate pinned post
_user.pinned_post = packPost(_user.pinned_post_id, meId, {
detail: true
});
}
if (meId && !meId.equals(_user.id)) {
const myFollowingIds = await getFriends(meId);
// Get following you know count
_user.following_you_know_count = Following.count({
followee_id: { $in: myFollowingIds },
follower_id: _user.id,
deleted_at: { $exists: false }
});
// Get followers you know count
_user.followers_you_know_count = Following.count({
followee_id: _user.id,
follower_id: { $in: myFollowingIds },
deleted_at: { $exists: false }
});
}
}
// resolve promises in _user object
_user = await rap(_user);
resolve(_user);
});
/*
function img(url) {
return {
thumbnail: {
large: `${url}`,
medium: '',
small: ''
}
};
}
*/

5
src/api/private/signin.ts
View File

@ -2,8 +2,7 @@ import * as express from 'express';
import * as bcrypt from 'bcryptjs'; import * as bcrypt from 'bcryptjs';
import * as speakeasy from 'speakeasy'; import * as speakeasy from 'speakeasy';
import { default as User, IUser } from '../models/user'; import { default as User, IUser } from '../models/user';
import Signin from '../models/signin'; import Signin, { pack } from '../models/signin';
import serialize from '../serializers/signin';
import event from '../event'; import event from '../event';
import signin from '../common/signin'; import signin from '../common/signin';
import config from '../../conf'; import config from '../../conf';
@ -85,5 +84,5 @@ export default async (req: express.Request, res: express.Response) => {
}); });
// Publish signin event // Publish signin event
event(user._id, 'signin', await serialize(record)); event(user._id, 'signin', await pack(record));
}; };

6
src/api/private/signup.ts
View File

@ -2,9 +2,7 @@ import * as uuid from 'uuid';
import * as express from 'express'; import * as express from 'express';
import * as bcrypt from 'bcryptjs'; import * as bcrypt from 'bcryptjs';
import recaptcha = require('recaptcha-promise'); import recaptcha = require('recaptcha-promise');
import { default as User, IUser } from '../models/user'; import User, { IUser, validateUsername, validatePassword, pack } from '../models/user';
import { validateUsername, validatePassword } from '../models/user';
import serialize from '../serializers/user';
import generateUserToken from '../common/generate-native-user-token'; import generateUserToken from '../common/generate-native-user-token';
import config from '../../conf'; import config from '../../conf';
@ -142,7 +140,7 @@ export default async (req: express.Request, res: express.Response) => {
}); });
// Response // Response
res.send(await serialize(account)); res.send(await pack(account));
// Create search index // Create search index
if (config.elasticsearch.enable) { if (config.elasticsearch.enable) {

83
src/api/serializers/app.ts
View File

@ -1,83 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import App from '../models/app';
import AccessToken from '../models/access-token';
import config from '../../conf';
/**
* Serialize an app
*
* @param {any} app
* @param {any} me?
* @param {any} options?
* @return {Promise<any>}
*/
export default (
app: any,
me?: any,
options?: {
includeSecret?: boolean,
includeProfileImageIds?: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = options || {
includeSecret: false,
includeProfileImageIds: false
};
let _app: any;
// Populate the app if 'app' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(app)) {
_app = await App.findOne({
_id: app
});
} else if (typeof app === 'string') {
_app = await App.findOne({
_id: new mongo.ObjectID(app)
});
} else {
_app = deepcopy(app);
}
// Me
if (me && !mongo.ObjectID.prototype.isPrototypeOf(me)) {
if (typeof me === 'string') {
me = new mongo.ObjectID(me);
} else {
me = me._id;
}
}
// Rename _id to id
_app.id = _app._id;
delete _app._id;
delete _app.name_id_lower;
// Visible by only owner
if (!opts.includeSecret) {
delete _app.secret;
}
_app.icon_url = _app.icon != null
? `${config.drive_url}/${_app.icon}`
: `${config.drive_url}/app-default.jpg`;
if (me) {
// 既に連携しているか
const exist = await AccessToken.count({
app_id: _app.id,
user_id: me,
}, {
limit: 1
});
_app.is_authorized = exist === 1;
}
resolve(_app);
});

40
src/api/serializers/auth-session.ts
View File

@ -1,40 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import serializeApp from './app';
/**
* Serialize an auth session
*
* @param {any} session
* @param {any} me?
* @return {Promise<any>}
*/
export default (
session: any,
me?: any
) => new Promise<any>(async (resolve, reject) => {
let _session: any;
// TODO: Populate session if it ID
_session = deepcopy(session);
// Me
if (me && !mongo.ObjectID.prototype.isPrototypeOf(me)) {
if (typeof me === 'string') {
me = new mongo.ObjectID(me);
} else {
me = me._id;
}
}
delete _session._id;
// Populate app
_session.app = await serializeApp(_session.app_id, me);
resolve(_session);
});

66
src/api/serializers/channel.ts
View File

@ -1,66 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import { IUser } from '../models/user';
import { default as Channel, IChannel } from '../models/channel';
import Watching from '../models/channel-watching';
/**
* Serialize a channel
*
* @param channel target
* @param me? serializee
* @return response
*/
export default (
channel: string | mongo.ObjectID | IChannel,
me?: string | mongo.ObjectID | IUser
) => new Promise<any>(async (resolve, reject) => {
let _channel: any;
// Populate the channel if 'channel' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(channel)) {
_channel = await Channel.findOne({
_id: channel
});
} else if (typeof channel === 'string') {
_channel = await Channel.findOne({
_id: new mongo.ObjectID(channel)
});
} else {
_channel = deepcopy(channel);
}
// Rename _id to id
_channel.id = _channel._id;
delete _channel._id;
// Remove needless properties
delete _channel.user_id;
// Me
const meId: mongo.ObjectID = me
? mongo.ObjectID.prototype.isPrototypeOf(me)
? me as mongo.ObjectID
: typeof me === 'string'
? new mongo.ObjectID(me)
: (me as IUser)._id
: null;
if (me) {
//#region Watchしているかどうか
const watch = await Watching.findOne({
user_id: meId,
channel_id: _channel.id,
deleted_at: { $exists: false }
});
_channel.is_watching = watch !== null;
//#endregion
}
resolve(_channel);
});

78
src/api/serializers/drive-file.ts
View File

@ -1,78 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import DriveFile from '../models/drive-file';
import serializeDriveFolder from './drive-folder';
import serializeDriveTag from './drive-tag';
import deepcopy = require('deepcopy');
import config from '../../conf';
/**
* Serialize a drive file
*
* @param {any} file
* @param {any} options?
* @return {Promise<any>}
*/
export default (
file: any,
options?: {
detail: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = Object.assign({
detail: false
}, options);
let _file: any;
// Populate the file if 'file' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(file)) {
_file = await DriveFile.findOne({
_id: file
});
} else if (typeof file === 'string') {
_file = await DriveFile.findOne({
_id: new mongo.ObjectID(file)
});
} else {
_file = deepcopy(file);
}
if (!_file) return reject('invalid file arg.');
// rendered target
let _target: any = {};
_target.id = _file._id;
_target.created_at = _file.uploadDate;
_target.name = _file.filename;
_target.type = _file.contentType;
_target.datasize = _file.length;
_target.md5 = _file.md5;
_target = Object.assign(_target, _file.metadata);
_target.url = `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
if (_target.properties == null) _target.properties = {};
if (opts.detail) {
if (_target.folder_id) {
// Populate folder
_target.folder = await serializeDriveFolder(_target.folder_id, {
detail: true
});
}
if (_target.tags) {
// Populate tags
_target.tags = await _target.tags.map(async (tag: any) =>
await serializeDriveTag(tag)
);
}
}
resolve(_target);
});

64
src/api/serializers/drive-folder.ts
View File

@ -1,64 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import DriveFolder from '../models/drive-folder';
import DriveFile from '../models/drive-file';
import deepcopy = require('deepcopy');
/**
* Serialize a drive folder
*
* @param {any} folder
* @param {any} options?
* @return {Promise<any>}
*/
const self = (
folder: any,
options?: {
detail: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = Object.assign({
detail: false
}, options);
let _folder: any;
// Populate the folder if 'folder' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(folder)) {
_folder = await DriveFolder.findOne({ _id: folder });
} else if (typeof folder === 'string') {
_folder = await DriveFolder.findOne({ _id: new mongo.ObjectID(folder) });
} else {
_folder = deepcopy(folder);
}
// Rename _id to id
_folder.id = _folder._id;
delete _folder._id;
if (opts.detail) {
const childFoldersCount = await DriveFolder.count({
parent_id: _folder.id
});
const childFilesCount = await DriveFile.count({
'metadata.folder_id': _folder.id
});
_folder.folders_count = childFoldersCount;
_folder.files_count = childFilesCount;
}
if (opts.detail && _folder.parent_id) {
// Populate parent folder
_folder.parent = await self(_folder.parent_id, {
detail: true
});
}
resolve(_folder);
});
export default self;

35
src/api/serializers/drive-tag.ts
View File

@ -1,35 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import DriveTag from '../models/drive-tag';
import deepcopy = require('deepcopy');
/**
* Serialize a drive tag
*
* @param {any} tag
* @return {Promise<any>}
*/
const self = (
tag: any
) => new Promise<any>(async (resolve, reject) => {
let _tag: any;
// Populate the tag if 'tag' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(tag)) {
_tag = await DriveTag.findOne({ _id: tag });
} else if (typeof tag === 'string') {
_tag = await DriveTag.findOne({ _id: new mongo.ObjectID(tag) });
} else {
_tag = deepcopy(tag);
}
// Rename _id to id
_tag.id = _tag._id;
delete _tag._id;
resolve(_tag);
});
export default self;

68
src/api/serializers/messaging-message.ts
View File

@ -1,68 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import Message from '../models/messaging-message';
import serializeUser from './user';
import serializeDriveFile from './drive-file';
import parse from '../common/text';
/**
* Serialize a message
*
* @param {any} message
* @param {any} me?
* @param {any} options?
* @return {Promise<any>}
*/
export default (
message: any,
me?: any,
options?: {
populateRecipient: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = options || {
populateRecipient: true
};
let _message: any;
// Populate the message if 'message' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(message)) {
_message = await Message.findOne({
_id: message
});
} else if (typeof message === 'string') {
_message = await Message.findOne({
_id: new mongo.ObjectID(message)
});
} else {
_message = deepcopy(message);
}
// Rename _id to id
_message.id = _message._id;
delete _message._id;
// Parse text
if (_message.text) {
_message.ast = parse(_message.text);
}
// Populate user
_message.user = await serializeUser(_message.user_id, me);
if (_message.file) {
// Populate file
_message.file = await serializeDriveFile(_message.file_id);
}
if (opts.populateRecipient) {
// Populate recipient
_message.recipient = await serializeUser(_message.recipient_id, me);
}
resolve(_message);
});

65
src/api/serializers/notification.ts
View File

@ -1,65 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import Notification from '../models/notification';
import serializeUser from './user';
import serializePost from './post';
import deepcopy = require('deepcopy');
/**
* Serialize a notification
*
* @param {any} notification
* @return {Promise<any>}
*/
export default (notification: any) => new Promise<any>(async (resolve, reject) => {
let _notification: any;
// Populate the notification if 'notification' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(notification)) {
_notification = await Notification.findOne({
_id: notification
});
} else if (typeof notification === 'string') {
_notification = await Notification.findOne({
_id: new mongo.ObjectID(notification)
});
} else {
_notification = deepcopy(notification);
}
// Rename _id to id
_notification.id = _notification._id;
delete _notification._id;
// Rename notifier_id to user_id
_notification.user_id = _notification.notifier_id;
delete _notification.notifier_id;
const me = _notification.notifiee_id;
delete _notification.notifiee_id;
// Populate notifier
_notification.user = await serializeUser(_notification.user_id, me);
switch (_notification.type) {
case 'follow':
// nope
break;
case 'mention':
case 'reply':
case 'repost':
case 'quote':
case 'reaction':
case 'poll_vote':
// Populate post
_notification.post = await serializePost(_notification.post_id, me);
break;
default:
console.error(`Unknown type: ${_notification.type}`);
break;
}
resolve(_notification);
});

43
src/api/serializers/post-reaction.ts
View File

@ -1,43 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import Reaction from '../models/post-reaction';
import serializeUser from './user';
/**
* Serialize a reaction
*
* @param {any} reaction
* @param {any} me?
* @return {Promise<any>}
*/
export default (
reaction: any,
me?: any
) => new Promise<any>(async (resolve, reject) => {
let _reaction: any;
// Populate the reaction if 'reaction' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(reaction)) {
_reaction = await Reaction.findOne({
_id: reaction
});
} else if (typeof reaction === 'string') {
_reaction = await Reaction.findOne({
_id: new mongo.ObjectID(reaction)
});
} else {
_reaction = deepcopy(reaction);
}
// Rename _id to id
_reaction.id = _reaction._id;
delete _reaction._id;
// Populate user
_reaction.user = await serializeUser(_reaction.user_id, me);
resolve(_reaction);
});

192
src/api/serializers/post.ts
View File

@ -1,192 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import { default as Post, IPost } from '../models/post';
import Reaction from '../models/post-reaction';
import { IUser } from '../models/user';
import Vote from '../models/poll-vote';
import serializeApp from './app';
import serializeChannel from './channel';
import serializeUser from './user';
import serializeDriveFile from './drive-file';
import parse from '../common/text';
import rap from '@prezzemolo/rap';
/**
* Serialize a post
*
* @param post target
* @param me? serializee
* @param options? serialize options
* @return response
*/
const self = async (
post: string | mongo.ObjectID | IPost,
me?: string | mongo.ObjectID | IUser,
options?: {
detail: boolean
}
) => {
const opts = options || {
detail: true,
};
// Me
const meId: mongo.ObjectID = me
? mongo.ObjectID.prototype.isPrototypeOf(me)
? me as mongo.ObjectID
: typeof me === 'string'
? new mongo.ObjectID(me)
: (me as IUser)._id
: null;
let _post: any;
// Populate the post if 'post' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(post)) {
_post = await Post.findOne({
_id: post
});
} else if (typeof post === 'string') {
_post = await Post.findOne({
_id: new mongo.ObjectID(post)
});
} else {
_post = deepcopy(post);
}
if (!_post) throw 'invalid post arg.';
const id = _post._id;
// Rename _id to id
_post.id = _post._id;
delete _post._id;
delete _post.mentions;
// Parse text
if (_post.text) {
_post.ast = parse(_post.text);
}
// Populate user
_post.user = serializeUser(_post.user_id, meId);
// Populate app
if (_post.app_id) {
_post.app = serializeApp(_post.app_id);
}
// Populate channel
if (_post.channel_id) {
_post.channel = serializeChannel(_post.channel_id);
}
// Populate media
if (_post.media_ids) {
_post.media = Promise.all(_post.media_ids.map(fileId =>
serializeDriveFile(fileId)
));
}
// When requested a detailed post data
if (opts.detail) {
// Get previous post info
_post.prev = (async () => {
const prev = await Post.findOne({
user_id: _post.user_id,
_id: {
$lt: id
}
}, {
fields: {
_id: true
},
sort: {
_id: -1
}
});
return prev ? prev._id : null;
})();
// Get next post info
_post.next = (async () => {
const next = await Post.findOne({
user_id: _post.user_id,
_id: {
$gt: id
}
}, {
fields: {
_id: true
},
sort: {
_id: 1
}
});
return next ? next._id : null;
})();
if (_post.reply_id) {
// Populate reply to post
_post.reply = self(_post.reply_id, meId, {
detail: false
});
}
if (_post.repost_id) {
// Populate repost
_post.repost = self(_post.repost_id, meId, {
detail: _post.text == null
});
}
// Poll
if (meId && _post.poll) {
_post.poll = (async (poll) => {
const vote = await Vote
.findOne({
user_id: meId,
post_id: id
});
if (vote != null) {
const myChoice = poll.choices
.filter(c => c.id == vote.choice)[0];
myChoice.is_voted = true;
}
return poll;
})(_post.poll);
}
// Fetch my reaction
if (meId) {
_post.my_reaction = (async () => {
const reaction = await Reaction
.findOne({
user_id: meId,
post_id: id,
deleted_at: { $exists: false }
});
if (reaction) {
return reaction.reaction;
}
return null;
})();
}
}
// resolve promises in _post object
_post = await rap(_post);
return _post;
};
export default self;

23
src/api/serializers/signin.ts
View File

@ -1,23 +0,0 @@
/**
* Module dependencies
*/
import deepcopy = require('deepcopy');
/**
* Serialize a signin record
*
* @param {any} record
* @return {Promise<any>}
*/
export default (
record: any
) => new Promise<any>(async (resolve, reject) => {
const _record = deepcopy(record);
// Rename _id to id
_record.id = _record._id;
delete _record._id;
resolve(_record);
});

190
src/api/serializers/user.ts
View File

@ -1,190 +0,0 @@
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import { default as User, IUser } from '../models/user';
import serializePost from './post';
import Following from '../models/following';
import Mute from '../models/mute';
import getFriends from '../common/get-friends';
import config from '../../conf';
import rap from '@prezzemolo/rap';
/**
* Serialize a user
*
* @param user target
* @param me? serializee
* @param options? serialize options
* @return response
*/
export default (
user: string | mongo.ObjectID | IUser,
me?: string | mongo.ObjectID | IUser,
options?: {
detail?: boolean,
includeSecrets?: boolean
}
) => new Promise<any>(async (resolve, reject) => {
const opts = Object.assign({
detail: false,
includeSecrets: false
}, options);
let _user: any;
const fields = opts.detail ? {
settings: false
} : {
settings: false,
client_settings: false,
profile: false,
keywords: false,
domains: false
};
// Populate the user if 'user' is ID
if (mongo.ObjectID.prototype.isPrototypeOf(user)) {
_user = await User.findOne({
_id: user
}, { fields });
} else if (typeof user === 'string') {
_user = await User.findOne({
_id: new mongo.ObjectID(user)
}, { fields });
} else {
_user = deepcopy(user);
}
if (!_user) return reject('invalid user arg.');
// Me
const meId: mongo.ObjectID = me
? mongo.ObjectID.prototype.isPrototypeOf(me)
? me as mongo.ObjectID
: typeof me === 'string'
? new mongo.ObjectID(me)
: (me as IUser)._id
: null;
// Rename _id to id
_user.id = _user._id;
delete _user._id;
// Remove needless properties
delete _user.latest_post;
// Remove private properties
delete _user.password;
delete _user.token;
delete _user.two_factor_temp_secret;
delete _user.two_factor_secret;
delete _user.username_lower;
if (_user.twitter) {
delete _user.twitter.access_token;
delete _user.twitter.access_token_secret;
}
delete _user.line;
// Visible via only the official client
if (!opts.includeSecrets) {
delete _user.email;
delete _user.client_settings;
}
if (!opts.detail) {
delete _user.two_factor_enabled;
}
_user.avatar_url = _user.avatar_id != null
? `${config.drive_url}/${_user.avatar_id}`
: `${config.drive_url}/default-avatar.jpg`;
_user.banner_url = _user.banner_id != null
? `${config.drive_url}/${_user.banner_id}`
: null;
if (!meId || !meId.equals(_user.id) || !opts.detail) {
delete _user.avatar_id;
delete _user.banner_id;
delete _user.drive_capacity;
}
if (meId && !meId.equals(_user.id)) {
// Whether the user is following
_user.is_following = (async () => {
const follow = await Following.findOne({
follower_id: meId,
followee_id: _user.id,
deleted_at: { $exists: false }
});
return follow !== null;
})();
// Whether the user is followed
_user.is_followed = (async () => {
const follow2 = await Following.findOne({
follower_id: _user.id,
followee_id: meId,
deleted_at: { $exists: false }
});
return follow2 !== null;
})();
// Whether the user is muted
_user.is_muted = (async () => {
const mute = await Mute.findOne({
muter_id: meId,
mutee_id: _user.id,
deleted_at: { $exists: false }
});
return mute !== null;
})();
}
if (opts.detail) {
if (_user.pinned_post_id) {
// Populate pinned post
_user.pinned_post = serializePost(_user.pinned_post_id, meId, {
detail: true
});
}
if (meId && !meId.equals(_user.id)) {
const myFollowingIds = await getFriends(meId);
// Get following you know count
_user.following_you_know_count = Following.count({
followee_id: { $in: myFollowingIds },
follower_id: _user.id,
deleted_at: { $exists: false }
});
// Get followers you know count
_user.followers_you_know_count = Following.count({
followee_id: _user.id,
follower_id: { $in: myFollowingIds },
deleted_at: { $exists: false }
});
}
}
// resolve promises in _user object
_user = await rap(_user);
resolve(_user);
});
/*
function img(url) {
return {
thumbnail: {
large: `${url}`,
medium: '',
small: ''
}
};
}
*/

7
src/api/service/twitter.ts
View File

@ -5,8 +5,7 @@ import * as uuid from 'uuid';
// const Twitter = require('twitter'); // const Twitter = require('twitter');
import autwh from 'autwh'; import autwh from 'autwh';
import redis from '../../db/redis'; import redis from '../../db/redis';
import User from '../models/user'; import User, { pack } from '../models/user';
import serialize from '../serializers/user';
import event from '../event'; import event from '../event';
import config from '../../conf'; import config from '../../conf';
import signin from '../common/signin'; import signin from '../common/signin';
@ -50,7 +49,7 @@ module.exports = (app: express.Application) => {
res.send(`Twitterの連携を解除しました :v:`); res.send(`Twitterの連携を解除しました :v:`);
// Publish i updated event // Publish i updated event
event(user._id, 'i_updated', await serialize(user, user, { event(user._id, 'i_updated', await pack(user, user, {
detail: true, detail: true,
includeSecrets: true includeSecrets: true
})); }));
@ -164,7 +163,7 @@ module.exports = (app: express.Application) => {
res.send(`Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`); res.send(`Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`);
// Publish i updated event // Publish i updated event
event(user._id, 'i_updated', await serialize(user, user, { event(user._id, 'i_updated', await pack(user, user, {
detail: true, detail: true,
includeSecrets: true includeSecrets: true
})); }));

4
src/api/stream/home.ts
View File

@ -4,7 +4,7 @@ import * as debug from 'debug';
import User from '../models/user'; import User from '../models/user';
import Mute from '../models/mute'; import Mute from '../models/mute';
import serializePost from '../serializers/post'; import { pack as packPost } from '../models/post';
import readNotification from '../common/read-notification'; import readNotification from '../common/read-notification';
const log = debug('misskey'); const log = debug('misskey');
@ -49,7 +49,7 @@ export default async function(request: websocket.request, connection: websocket.
case 'post-stream': case 'post-stream':
const postId = channel.split(':')[2]; const postId = channel.split(':')[2];
log(`RECEIVED: ${postId} ${data} by @${user.username}`); log(`RECEIVED: ${postId} ${data} by @${user.username}`);
const post = await serializePost(postId, user, { const post = await packPost(postId, user, {
detail: true detail: true
}); });
connection.send(JSON.stringify({ connection.send(JSON.stringify({