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

Use PostgreSQL instead of MongoDB (#4572)

Browse Source 
* wip

* Update note.ts

* Update timeline.ts

* Update core.ts

* wip

* Update generate-visibility-query.ts

* wip

* wip

* wip

* wip

* wip

* Update global-timeline.ts

* wip

* wip

* wip

* Update vote.ts

* wip

* wip

* Update create.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update files.ts

* wip

* wip

* Update CONTRIBUTING.md

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update read-notification.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update cancel.ts

* wip

* wip

* wip

* Update show.ts

* wip

* wip

* Update gen-id.ts

* Update create.ts

* Update id.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Docker: Update files about Docker (#4599)

* Docker: Use cache if files used by `yarn install` was not updated

This patch reduces the number of times to installing node_modules.
For example, `yarn install` step will be skipped when only ".config/default.yml" is updated.

* Docker: Migrate MongoDB to Postgresql

Misskey uses Postgresql as a database instead of Mongodb since version 11.

* Docker: Uncomment about data persistence

This patch will save a lot of databases.

* wip

* wip

* wip

* Update activitypub.ts

* wip

* wip

* wip

* Update logs.ts

* wip

* Update drive-file.ts

* Update register.ts

* wip

* wip

* Update mentions.ts

* wip

* wip

* wip

* Update recommendation.ts

* wip

* Update index.ts

* wip

* Update recommendation.ts

* Doc: Update docker.ja.md and docker.en.md (#1) (#4608)

Update how to set up misskey.

* wip

* ✌️

* wip

* Update note.ts

* Update postgre.ts

* wip

* wip

* wip

* wip

* Update add-file.ts

* wip

* wip

* wip

* Clean up

* Update logs.ts

* wip

* 🍕

* wip

* Ad notes

* wip

* Update api-visibility.ts

* Update note.ts

* Update add-file.ts

* tests

* tests

* Update postgre.ts

* Update utils.ts

* wip

* wip

* Refactor

* wip

* Refactor

* wip

* wip

* Update show-users.ts

* Update update-instance.ts

* wip

* Update feed.ts

* Update outbox.ts

* Update outbox.ts

* Update user.ts

* wip

* Update list.ts

* Update update-hashtag.ts

* wip

* Update update-hashtag.ts

* Refactor

* Update update.ts

* wip

* wip

* ✌️

* clean up

* docs

* Update push.ts

* wip

* Update api.ts

* wip

* ✌️

* Update make-pagination-query.ts

* ✌️

* Delete hashtags.ts

* Update instances.ts

* Update instances.ts

* Update create.ts

* Update search.ts

* Update reversi-game.ts

* Update signup.ts

* Update user.ts

* id

* Update example.yml

* 🎨

* objectid

* fix

* reversi

* reversi

* Fix bug of chart engine

* Add test of chart engine

* Improve test

* Better testing

* Improve chart engine

* Refactor

* Add test of chart engine

* Refactor

* Add chart test

* Fix bug

* コミットし忘れ

* Refactoring

* ✌️

* Add tests

* Add test

* Extarct note tests

* Refactor

* 存在しないユーザーにメンションできなくなっていた問題を修正

* Fix bug

* Update update-meta.ts

* Fix bug

* Update mention.vue

* Fix bug

* Update meta.ts

* Update CONTRIBUTING.md

* Fix bug

* Fix bug

* Fix bug

* Clean up

* Clean up

* Update notification.ts

* Clean up

* Add mute tests

* Add test

* Refactor

* Add test

* Fix test

* Refactor

* Refactor

* Add tests

* Update utils.ts

* Update utils.ts

* Fix test

* Update package.json

* Update update.ts

* Update manifest.ts

* Fix bug

* Fix bug

* Add test

* 🎨

* Update endpoint permissions

* Updaye permisison

* Update person.ts

#4299

* データベースと同期しないように

* Fix bug

* Fix bug

* Update reversi-game.ts

* Use a feature of Node v11.7.0 to extract a public key (#4644)

* wip

* wip

* ✌️

* Refactoring

#1540

* test

* test

* test

* test

* test

* test

* test

* Fix bug

* Fix test

* 🍣

* wip

* #4471

* Add test for #4335

* Refactor

* Fix test

* Add tests

* 🕓

* Fix bug

* Add test

* Add test

* rename

* Fix bug
This commit is contained in:
syuilo
2019-04-07 21:50:36 +09:00
committed by GitHub
parent 13caf37991
commit f0a29721c9
592 changed files with 13463 additions and 14147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/api/endpoints/i/2fa/done.ts
View File

@@ -1,7 +1,7 @@
import $ from 'cafy';
import * as speakeasy from 'speakeasy';
import User from '../../../../../models/user';
import define from '../../../define';
import { Users } from '../../../../../models';
export const meta = {
requireCredential: true,
@@ -32,12 +32,8 @@ export default define(meta, async (ps, user) => {
throw new Error('not verified');
}
await User.update(user._id, {
$set: {
'twoFactorSecret': user.twoFactorTempSecret,
'twoFactorEnabled': true
}
await Users.update(user.id, {
twoFactorSecret: user.twoFactorTempSecret,
twoFactorEnabled: true
});
return;
});

8
src/server/api/endpoints/i/2fa/register.ts
View File

@@ -2,9 +2,9 @@ import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import * as speakeasy from 'speakeasy';
import * as QRCode from 'qrcode';
import User from '../../../../../models/user';
import config from '../../../../../config';
import define from '../../../define';
import { Users } from '../../../../../models';
export const meta = {
requireCredential: true,
@@ -31,10 +31,8 @@ export default define(meta, async (ps, user) => {
length: 32
});
await User.update(user._id, {
$set: {
twoFactorTempSecret: secret.base32
}
await Users.update(user.id, {
twoFactorTempSecret: secret.base32
});
// Get the data URL of the authenticator URL

10
src/server/api/endpoints/i/2fa/unregister.ts
View File

@@ -1,7 +1,7 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import User from '../../../../../models/user';
import define from '../../../define';
import { Users } from '../../../../../models';
export const meta = {
requireCredential: true,
@@ -23,11 +23,9 @@ export default define(meta, async (ps, user) => {
throw new Error('incorrect password');
}
await User.update(user._id, {
$set: {
'twoFactorSecret': null,
'twoFactorEnabled': false
}
await Users.update(user.id, {
twoFactorSecret: null,
twoFactorEnabled: false
});
return;

25
src/server/api/endpoints/i/authorized-apps.ts
View File

@@ -1,7 +1,6 @@
import $ from 'cafy';
import AccessToken from '../../../../models/access-token';
import { pack } from '../../../../models/app';
import define from '../../define';
import { AccessTokens, Apps } from '../../../../models';
export const meta = {
requireCredential: true,
@@ -28,18 +27,18 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Get tokens
const tokens = await AccessToken
.find({
userId: user._id
}, {
limit: ps.limit,
skip: ps.offset,
sort: {
_id: ps.sort == 'asc' ? 1 : -1
}
});
const tokens = await AccessTokens.find({
where: {
userId: user.id
},
take: ps.limit,
skip: ps.offset,
order: {
id: ps.sort == 'asc' ? 1 : -1
}
});
return await Promise.all(tokens.map(token => pack(token.appId, user, {
return await Promise.all(tokens.map(token => Apps.pack(token.appId, user, {
detail: true
})));
});

10
src/server/api/endpoints/i/change-password.ts
View File

@@ -1,7 +1,7 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import User from '../../../../models/user';
import define from '../../define';
import { Users } from '../../../../models';
export const meta = {
requireCredential: true,
@@ -31,11 +31,7 @@ export default define(meta, async (ps, user) => {
const salt = await bcrypt.genSalt(8);
const hash = await bcrypt.hash(ps.newPassword, salt);
await User.update(user._id, {
$set: {
'password': hash
}
await Users.update(user.id, {
password: hash
});
return;
});

23
src/server/api/endpoints/i/clear-follow-request-notification.ts
View File

@@ -1,23 +0,0 @@
import User from '../../../../models/user';
import define from '../../define';
export const meta = {
tags: ['account', 'following'],
requireCredential: true,
kind: 'account-write',
params: {
}
};
export default define(meta, async (ps, user) => {
await User.update({ _id: user._id }, {
$set: {
pendingReceivedFollowRequestsCount: 0
}
});
return;
});

29
src/server/api/endpoints/i/delete-account.ts
View File

@@ -1,10 +1,7 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import User from '../../../../models/user';
import define from '../../define';
import { createDeleteNotesJob, createDeleteDriveFilesJob } from '../../../../queue';
import Message from '../../../../models/messaging-message';
import Signin from '../../../../models/signin';
import { Users } from '../../../../models';
export const meta = {
requireCredential: true,
@@ -26,27 +23,5 @@ export default define(meta, async (ps, user) => {
throw new Error('incorrect password');
}
await User.update({ _id: user._id }, {
$set: {
isDeleted: true,
name: null,
description: null,
pinnedNoteIds: [],
password: null,
email: null,
twitter: null,
github: null,
discord: null,
profile: {},
fields: [],
clientSettings: {},
}
});
Message.remove({ userId: user._id });
Signin.remove({ userId: user._id });
createDeleteNotesJob(user);
createDeleteDriveFilesJob(user);
return;
await Users.delete(user.id);
});

2
src/server/api/endpoints/i/export-blocking.ts
View File

@@ -13,6 +13,4 @@ export const meta = {
export default define(meta, async (ps, user) => {
createExportBlockingJob(user);
return;
});

2
src/server/api/endpoints/i/export-following.ts
View File

@@ -13,6 +13,4 @@ export const meta = {
export default define(meta, async (ps, user) => {
createExportFollowingJob(user);
return;
});

2
src/server/api/endpoints/i/export-mute.ts
View File

@@ -13,6 +13,4 @@ export const meta = {
export default define(meta, async (ps, user) => {
createExportMuteJob(user);
return;
});

2
src/server/api/endpoints/i/export-notes.ts
View File

@@ -13,6 +13,4 @@ export const meta = {
export default define(meta, async (ps, user) => {
createExportNotesJob(user);
return;
});

2
src/server/api/endpoints/i/export-user-lists.ts
View File

@@ -13,6 +13,4 @@ export const meta = {
export default define(meta, async (ps, user) => {
createExportUserListsJob(user);
return;
});

41
src/server/api/endpoints/i/favorites.ts
View File

@@ -1,7 +1,8 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import Favorite, { packMany } from '../../../../models/favorite';
import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
import { NoteFavorites } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
desc: {
@@ -23,42 +24,22 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
transform: transform,
},
untilId: {
validator: $.optional.type(ID),
transform: transform,
}
},
}
};
export default define(meta, async (ps, user) => {
const query = {
userId: user._id
} as any;
const query = makePaginationQuery(NoteFavorites.createQueryBuilder('favorite'), ps.sinceId, ps.untilId)
.andWhere(`favorite.userId = :meId`, { meId: user.id })
.leftJoinAndSelect('favorite.note', 'note');
const sort = {
_id: -1
};
const favorites = await query
.take(ps.limit)
.getMany();
if (ps.sinceId) {
sort._id = 1;
query._id = {
$gt: ps.sinceId
};
} else if (ps.untilId) {
query._id = {
$lt: ps.untilId
};
}
// Get favorites
const favorites = await Favorite
.find(query, {
limit: ps.limit,
sort: sort
});
return await packMany(favorites, user);
return await NoteFavorites.packMany(favorites, user);
});

19
src/server/api/endpoints/i/import-following.ts
View File

@@ -1,10 +1,10 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
import { createImportFollowingJob } from '../../../../queue';
import ms = require('ms');
import DriveFile from '../../../../models/drive-file';
import { ApiError } from '../../error';
import { DriveFiles } from '../../../../models';
export const meta = {
secure: true,
@@ -17,7 +17,6 @@ export const meta = {
params: {
fileId: {
validator: $.type(ID),
transform: transform,
}
},
@@ -49,16 +48,12 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
const file = await DriveFile.findOne({
_id: ps.fileId
});
const file = await DriveFiles.findOne(ps.fileId);
if (file == null) throw new ApiError(meta.errors.noSuchFile);
//if (!file.contentType.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
if (file.length > 50000) throw new ApiError(meta.errors.tooBigFile);
if (file.length === 0) throw new ApiError(meta.errors.emptyFile);
//if (!file.type.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
if (file.size > 50000) throw new ApiError(meta.errors.tooBigFile);
if (file.size === 0) throw new ApiError(meta.errors.emptyFile);
createImportFollowingJob(user, file._id);
return;
createImportFollowingJob(user, file.id);
});

19
src/server/api/endpoints/i/import-user-lists.ts
View File

@@ -1,10 +1,10 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
import { createImportUserListsJob } from '../../../../queue';
import ms = require('ms');
import DriveFile from '../../../../models/drive-file';
import { ApiError } from '../../error';
import { DriveFiles } from '../../../../models';
export const meta = {
secure: true,
@@ -17,7 +17,6 @@ export const meta = {
params: {
fileId: {
validator: $.type(ID),
transform: transform,
}
},
@@ -49,16 +48,12 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
const file = await DriveFile.findOne({
_id: ps.fileId
});
const file = await DriveFiles.findOne(ps.fileId);
if (file == null) throw new ApiError(meta.errors.noSuchFile);
//if (!file.contentType.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
if (file.length > 30000) throw new ApiError(meta.errors.tooBigFile);
if (file.length === 0) throw new ApiError(meta.errors.emptyFile);
//if (!file.type.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
if (file.size > 30000) throw new ApiError(meta.errors.tooBigFile);
if (file.size === 0) throw new ApiError(meta.errors.emptyFile);
createImportUserListsJob(user, file._id);
return;
createImportUserListsJob(user, file.id);
});

81
src/server/api/endpoints/i/notifications.ts
View File

@@ -1,11 +1,9 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import Notification from '../../../../models/notification';
import { packMany } from '../../../../models/notification';
import { getFriendIds } from '../../common/get-friends';
import read from '../../common/read-notification';
import { ID } from '../../../../misc/cafy-id';
import { readNotification } from '../../common/read-notification';
import define from '../../define';
import { getHideUserIds } from '../../common/get-hide-users';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { Notifications, Followings, Mutings } from '../../../../models';
export const meta = {
desc: {
@@ -17,7 +15,7 @@ export const meta = {
requireCredential: true,
kind: 'account-read',
kind: 'read:notifications',
params: {
limit: {
@@ -27,12 +25,10 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
transform: transform,
},
untilId: {
validator: $.optional.type(ID),
transform: transform,
},
following: {
@@ -46,12 +42,12 @@ export const meta = {
},
includeTypes: {
validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'])),
default: [] as string[]
},
excludeTypes: {
validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'])),
default: [] as string[]
}
},
@@ -65,63 +61,38 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
const hideUserIds = await getHideUserIds(user);
const followingQuery = Followings.createQueryBuilder('following')
.select('following.followeeId')
.where('following.followerId = :followerId', { followerId: user.id });
const query = {
notifieeId: user._id,
$and: [{
notifierId: {
$nin: hideUserIds
}
}]
} as any;
const mutingQuery = Mutings.createQueryBuilder('muting')
.select('muting.muteeId')
.where('muting.muterId = :muterId', { muterId: user.id });
const sort = {
_id: -1
};
const query = makePaginationQuery(Notifications.createQueryBuilder('notification'), ps.sinceId, ps.untilId)
.andWhere(`notification.notifieeId = :meId`, { meId: user.id })
.leftJoinAndSelect('notification.notifier', 'notifier');
query.andWhere(`notification.notifierId NOT IN (${ mutingQuery.getQuery() })`);
query.setParameters(mutingQuery.getParameters());
if (ps.following) {
// ID list of the user itself and other users who the user follows
const followingIds = await getFriendIds(user._id);
query.$and.push({
notifierId: {
$in: followingIds
}
});
}
if (ps.sinceId) {
sort._id = 1;
query._id = {
$gt: ps.sinceId
};
} else if (ps.untilId) {
query._id = {
$lt: ps.untilId
};
query.andWhere(`((notification.notifierId IN (${ followingQuery.getQuery() })) OR (notification.notifierId = :meId))`, { meId: user.id });
query.setParameters(followingQuery.getParameters());
}
if (ps.includeTypes.length > 0) {
query.type = {
$in: ps.includeTypes
};
query.andWhere(`notification.type IN (:...includeTypes)`, { includeTypes: ps.includeTypes });
} else if (ps.excludeTypes.length > 0) {
query.type = {
$nin: ps.excludeTypes
};
query.andWhere(`notification.type NOT IN (:...excludeTypes)`, { excludeTypes: ps.excludeTypes });
}
const notifications = await Notification
.find(query, {
limit: ps.limit,
sort: sort
});
const notifications = await query.take(ps.limit).getMany();
// Mark all as read
if (notifications.length > 0 && ps.markAsRead) {
read(user._id, notifications);
readNotification(user.id, notifications.map(x => x.id));
}
return await packMany(notifications);
return await Notifications.packMany(notifications);
});

9
src/server/api/endpoints/i/pin.ts
View File

@@ -1,9 +1,9 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import { pack } from '../../../../models/user';
import { ID } from '../../../../misc/cafy-id';
import { addPinned } from '../../../../services/i/pin';
import define from '../../define';
import { ApiError } from '../../error';
import { Users } from '../../../../models';
export const meta = {
stability: 'stable',
@@ -16,12 +16,11 @@ export const meta = {
requireCredential: true,
kind: 'account-write',
kind: 'write:account',
params: {
noteId: {
validator: $.type(ID),
transform: transform,
desc: {
'ja-JP': '対象の投稿のID',
'en-US': 'Target note ID'
@@ -58,7 +57,7 @@ export default define(meta, async (ps, user) => {
throw e;
});
return await pack(user, user, {
return await Users.pack(user, user, {
detail: true
});
});

25
src/server/api/endpoints/i/read-all-messaging-messages.ts
View File

@@ -1,7 +1,6 @@
import User from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import Message from '../../../../models/messaging-message';
import define from '../../define';
import { MessagingMessages } from '../../../../models';
export const meta = {
desc: {
@@ -13,7 +12,7 @@ export const meta = {
requireCredential: true,
kind: 'account-write',
kind: 'write:account',
params: {
}
@@ -21,24 +20,12 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Update documents
await Message.update({
recipientId: user._id,
await MessagingMessages.update({
recipientId: user.id,
isRead: false
}, {
$set: {
isRead: true
}
}, {
multi: true
isRead: true
});
User.update({ _id: user._id }, {
$set: {
hasUnreadMessagingMessage: false
}
});
publishMainStream(user._id, 'readAllMessagingMessages');
return;
publishMainStream(user.id, 'readAllMessagingMessages');
});

22
src/server/api/endpoints/i/read-all-unread-notes.ts
View File

@@ -1,7 +1,6 @@
import User from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import NoteUnread from '../../../../models/note-unread';
import define from '../../define';
import { NoteUnreads } from '../../../../models';
export const meta = {
desc: {
@@ -13,7 +12,7 @@ export const meta = {
requireCredential: true,
kind: 'account-write',
kind: 'write:account',
params: {
}
@@ -21,20 +20,11 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Remove documents
await NoteUnread.remove({
userId: user._id
});
User.update({ _id: user._id }, {
$set: {
hasUnreadMentions: false,
hasUnreadSpecifiedNotes: false
}
await NoteUnreads.delete({
userId: user.id
});
// 全て既読になったイベントを発行
publishMainStream(user._id, 'readAllUnreadMentions');
publishMainStream(user._id, 'readAllUnreadSpecifiedNotes');
return;
publishMainStream(user.id, 'readAllUnreadMentions');
publishMainStream(user.id, 'readAllUnreadSpecifiedNotes');
});

12
src/server/api/endpoints/i/regenerate-token.ts
View File

@@ -1,9 +1,9 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import User from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import generateUserToken from '../../common/generate-native-user-token';
import define from '../../define';
import { Users } from '../../../../models';
export const meta = {
requireCredential: true,
@@ -28,14 +28,10 @@ export default define(meta, async (ps, user) => {
// Generate secret
const secret = generateUserToken();
await User.update(user._id, {
$set: {
'token': secret
}
await Users.update(user.id, {
token: secret
});
// Publish event
publishMainStream(user._id, 'myTokenRegenerated');
return;
publishMainStream(user.id, 'myTokenRegenerated');
});

35
src/server/api/endpoints/i/signin-history.ts
View File

@@ -1,7 +1,8 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import Signin, { pack } from '../../../../models/signin';
import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
import { Signins } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
requireCredential: true,
@@ -16,41 +17,19 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
transform: transform,
},
untilId: {
validator: $.optional.type(ID),
transform: transform,
}
}
};
export default define(meta, async (ps, user) => {
const query = {
userId: user._id
} as any;
const query = makePaginationQuery(Signins.createQueryBuilder('signin'), ps.sinceId, ps.untilId)
.andWhere(`signin.userId = :meId`, { meId: user.id });
const sort = {
_id: -1
};
const history = await query.take(ps.limit).getMany();
if (ps.sinceId) {
sort._id = 1;
query._id = {
$gt: ps.sinceId
};
} else if (ps.untilId) {
query._id = {
$lt: ps.untilId
};
}
const history = await Signin
.find(query, {
limit: ps.limit,
sort: sort
});
return await Promise.all(history.map(record => pack(record)));
return await Promise.all(history.map(record => Signins.pack(record)));
});

9
src/server/api/endpoints/i/unpin.ts
View File

@@ -1,9 +1,9 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import { pack } from '../../../../models/user';
import { ID } from '../../../../misc/cafy-id';
import { removePinned } from '../../../../services/i/pin';
import define from '../../define';
import { ApiError } from '../../error';
import { Users } from '../../../../models';
export const meta = {
stability: 'stable',
@@ -16,12 +16,11 @@ export const meta = {
requireCredential: true,
kind: 'account-write',
kind: 'write:account',
params: {
noteId: {
validator: $.type(ID),
transform: transform,
desc: {
'ja-JP': '対象の投稿のID',
'en-US': 'Target note ID'
@@ -44,7 +43,7 @@ export default define(meta, async (ps, user) => {
throw e;
});
return await pack(user, user, {
return await Users.pack(user, user, {
detail: true
});
});

22
src/server/api/endpoints/i/update-client-setting.ts
View File

@@ -1,7 +1,7 @@
import $ from 'cafy';
import User from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
import { Users } from '../../../../models';
export const meta = {
requireCredential: true,
@@ -10,7 +10,7 @@ export const meta = {
params: {
name: {
validator: $.str
validator: $.str.match(/^[a-zA-Z]+$/)
},
value: {
@@ -20,18 +20,18 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
const x: any = {};
x[`clientSettings.${ps.name}`] = ps.value;
await User.update(user._id, {
$set: x
});
await Users.createQueryBuilder().update()
.set({
clientData: {
[ps.name]: ps.value
},
})
.where('id = :id', { id: user.id })
.execute();
// Publish event
publishMainStream(user._id, 'clientSettingUpdated', {
publishMainStream(user.id, 'clientSettingUpdated', {
key: ps.name,
value: ps.value
});
return;
});

24
src/server/api/endpoints/i/update-email.ts
View File

@@ -1,5 +1,4 @@
import $ from 'cafy';
import User, { pack } from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
import * as nodemailer from 'nodemailer';
@@ -9,6 +8,7 @@ import config from '../../../../config';
import * as ms from 'ms';
import * as bcrypt from 'bcryptjs';
import { apiLogger } from '../../logger';
import { Users } from '../../../../models';
export const meta = {
requireCredential: true,
@@ -39,29 +39,25 @@ export default define(meta, async (ps, user) => {
throw new Error('incorrect password');
}
await User.update(user._id, {
$set: {
email: ps.email,
emailVerified: false,
emailVerifyCode: null
}
await Users.update(user.id, {
email: ps.email,
emailVerified: false,
emailVerifyCode: null
});
const iObj = await pack(user._id, user, {
const iObj = await Users.pack(user.id, user, {
detail: true,
includeSecrets: true
});
// Publish meUpdated event
publishMainStream(user._id, 'meUpdated', iObj);
publishMainStream(user.id, 'meUpdated', iObj);
if (ps.email != null) {
const code = rndstr('a-z0-9', 16);
await User.update(user._id, {
$set: {
emailVerifyCode: code
}
await Users.update(user.id, {
emailVerifyCode: code
});
const meta = await fetchMeta();
@@ -84,7 +80,7 @@ export default define(meta, async (ps, user) => {
transporter.sendMail({
from: meta.email,
to: ps.email,
subject: meta.name,
subject: meta.name || 'Misskey',
text: `To verify email, please click this link: ${link}`
}, (error, info) => {
if (error) {

33
src/server/api/endpoints/i/update-home.ts
View File

@@ -1,33 +0,0 @@
import $ from 'cafy';
import User from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
export const meta = {
requireCredential: true,
secure: true,
params: {
home: {
validator: $.arr($.obj({
name: $.str,
id: $.str,
place: $.str,
data: $.obj()
}).strict())
}
}
};
export default define(meta, async (ps, user) => {
await User.update(user._id, {
$set: {
'clientSettings.home': ps.home
}
});
publishMainStream(user._id, 'homeUpdated', ps.home);
return;
});

32
src/server/api/endpoints/i/update-mobile-home.ts
View File

@@ -1,32 +0,0 @@
import $ from 'cafy';
import User from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
export const meta = {
requireCredential: true,
secure: true,
params: {
home: {
validator: $.arr($.obj({
name: $.str,
id: $.str,
data: $.obj()
}).strict())
}
}
};
export default define(meta, async (ps, user) => {
await User.update(user._id, {
$set: {
'clientSettings.mobileHome': ps.home
}
});
publishMainStream(user._id, 'mobileHomeUpdated', ps.home);
return;
});

88
src/server/api/endpoints/i/update-widget.ts
View File

@@ -1,88 +0,0 @@
import $ from 'cafy';
import User from '../../../../models/user';
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
export const meta = {
requireCredential: true,
secure: true,
params: {
id: {
validator: $.str
},
data: {
validator: $.obj()
}
}
};
export default define(meta, async (ps, user) => {
if (ps.id == null && ps.data == null) throw new Error('you need to set id and data params if home param unset');
let widget;
//#region Desktop home
if (widget == null && user.clientSettings.home) {
const desktopHome = user.clientSettings.home;
widget = desktopHome.find((w: any) => w.id == ps.id);
if (widget) {
widget.data = ps.data;
await User.update(user._id, {
$set: {
'clientSettings.home': desktopHome
}
});
}
}
//#endregion
//#region Mobile home
if (widget == null && user.clientSettings.mobileHome) {
const mobileHome = user.clientSettings.mobileHome;
widget = mobileHome.find((w: any) => w.id == ps.id);
if (widget) {
widget.data = ps.data;
await User.update(user._id, {
$set: {
'clientSettings.mobileHome': mobileHome
}
});
}
}
//#endregion
//#region Deck
if (widget == null && user.clientSettings.deck && user.clientSettings.deck.columns) {
const deck = user.clientSettings.deck;
for (const c of deck.columns.filter((c: any) => c.type == 'widgets')) {
for (const w of c.widgets.filter((w: any) => w.id == ps.id)) {
widget = w;
}
}
if (widget) {
widget.data = ps.data;
await User.update(user._id, {
$set: {
'clientSettings.deck': deck
}
});
}
}
//#endregion
if (widget) {
publishMainStream(user._id, 'widgetUpdated', {
id: ps.id, data: ps.data
});
return;
} else {
throw new Error('widget not found');
}
});

142
src/server/api/endpoints/i/update.ts
View File

@@ -1,18 +1,16 @@
import $ from 'cafy';
import ID, { transform } from '../../../../misc/cafy-id';
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
import { ID } from '../../../../misc/cafy-id';
import { publishMainStream } from '../../../../services/stream';
import DriveFile from '../../../../models/drive-file';
import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
import { publishToFollowers } from '../../../../services/i/update';
import define from '../../define';
import getDriveFileUrl from '../../../../misc/get-drive-file-url';
import { parse, parsePlain } from '../../../../mfm/parse';
import extractEmojis from '../../../../misc/extract-emojis';
import extractHashtags from '../../../../misc/extract-hashtags';
import * as langmap from 'langmap';
import { updateHashtag } from '../../../../services/update-hashtag';
import { ApiError } from '../../error';
import { Users, DriveFiles } from '../../../../models';
export const meta = {
desc: {
@@ -24,18 +22,18 @@ export const meta = {
requireCredential: true,
kind: 'account-write',
kind: 'write:account',
params: {
name: {
validator: $.optional.nullable.str.pipe(isValidName),
validator: $.optional.nullable.str.pipe(Users.isValidName),
desc: {
'ja-JP': '名前(ハンドルネームやニックネーム)'
}
},
description: {
validator: $.optional.nullable.str.pipe(isValidDescription),
validator: $.optional.nullable.str.pipe(Users.isValidDescription),
desc: {
'ja-JP': 'アカウントの説明や自己紹介'
}
@@ -49,14 +47,14 @@ export const meta = {
},
location: {
validator: $.optional.nullable.str.pipe(isValidLocation),
validator: $.optional.nullable.str.pipe(Users.isValidLocation),
desc: {
'ja-JP': '住んでいる地域、所在'
}
},
birthday: {
validator: $.optional.nullable.str.pipe(isValidBirthday),
validator: $.optional.nullable.str.pipe(Users.isValidBirthday),
desc: {
'ja-JP': '誕生日 (YYYY-MM-DD形式)'
}
@@ -64,7 +62,6 @@ export const meta = {
avatarId: {
validator: $.optional.nullable.type(ID),
transform: transform,
desc: {
'ja-JP': 'アイコンに設定する画像のドライブファイルID'
}
@@ -72,20 +69,11 @@ export const meta = {
bannerId: {
validator: $.optional.nullable.type(ID),
transform: transform,
desc: {
'ja-JP': 'バナーに設定する画像のドライブファイルID'
}
},
wallpaperId: {
validator: $.optional.nullable.type(ID),
transform: transform,
desc: {
'ja-JP': '壁紙に設定する画像のドライブファイルID'
}
},
isLocked: {
validator: $.optional.bool,
desc: {
@@ -171,116 +159,76 @@ export default define(meta, async (ps, user, app) => {
if (ps.name !== undefined) updates.name = ps.name;
if (ps.description !== undefined) updates.description = ps.description;
if (ps.lang !== undefined) updates.lang = ps.lang;
if (ps.location !== undefined) updates['profile.location'] = ps.location;
if (ps.birthday !== undefined) updates['profile.birthday'] = ps.birthday;
if (ps.location !== undefined) updates.location = ps.location;
if (ps.birthday !== undefined) updates.birthday = ps.birthday;
if (ps.avatarId !== undefined) updates.avatarId = ps.avatarId;
if (ps.bannerId !== undefined) updates.bannerId = ps.bannerId;
if (ps.wallpaperId !== undefined) updates.wallpaperId = ps.wallpaperId;
if (typeof ps.isLocked == 'boolean') updates.isLocked = ps.isLocked;
if (typeof ps.isBot == 'boolean') updates.isBot = ps.isBot;
if (typeof ps.carefulBot == 'boolean') updates.carefulBot = ps.carefulBot;
if (typeof ps.autoAcceptFollowed == 'boolean') updates.autoAcceptFollowed = ps.autoAcceptFollowed;
if (typeof ps.isCat == 'boolean') updates.isCat = ps.isCat;
if (typeof ps.autoWatch == 'boolean') updates['settings.autoWatch'] = ps.autoWatch;
if (typeof ps.alwaysMarkNsfw == 'boolean') updates['settings.alwaysMarkNsfw'] = ps.alwaysMarkNsfw;
if (typeof ps.autoWatch == 'boolean') updates.autoWatch = ps.autoWatch;
if (typeof ps.alwaysMarkNsfw == 'boolean') updates.alwaysMarkNsfw = ps.alwaysMarkNsfw;
if (ps.avatarId) {
const avatar = await DriveFile.findOne({
_id: ps.avatarId
});
const avatar = await DriveFiles.findOne(ps.avatarId);
if (avatar == null) throw new ApiError(meta.errors.noSuchAvatar);
if (!avatar.contentType.startsWith('image/')) throw new ApiError(meta.errors.avatarNotAnImage);
if (avatar == null || avatar.userId !== user.id) throw new ApiError(meta.errors.noSuchAvatar);
if (!avatar.type.startsWith('image/')) throw new ApiError(meta.errors.avatarNotAnImage);
if (avatar.metadata.deletedAt) {
updates.avatarUrl = null;
} else {
updates.avatarUrl = getDriveFileUrl(avatar, true);
updates.avatarUrl = avatar.thumbnailUrl;
if (avatar.metadata.properties.avgColor) {
updates.avatarColor = avatar.metadata.properties.avgColor;
}
if (avatar.properties.avgColor) {
updates.avatarColor = avatar.properties.avgColor;
}
}
if (ps.bannerId) {
const banner = await DriveFile.findOne({
_id: ps.bannerId
});
const banner = await DriveFiles.findOne(ps.bannerId);
if (banner == null) throw new ApiError(meta.errors.noSuchBanner);
if (!banner.contentType.startsWith('image/')) throw new ApiError(meta.errors.bannerNotAnImage);
if (banner == null || banner.userId !== user.id) throw new ApiError(meta.errors.noSuchBanner);
if (!banner.type.startsWith('image/')) throw new ApiError(meta.errors.bannerNotAnImage);
if (banner.metadata.deletedAt) {
updates.bannerUrl = null;
} else {
updates.bannerUrl = getDriveFileUrl(banner, false);
updates.bannerUrl = banner.webpublicUrl;
if (banner.metadata.properties.avgColor) {
updates.bannerColor = banner.metadata.properties.avgColor;
}
}
}
if (ps.wallpaperId !== undefined) {
if (ps.wallpaperId === null) {
updates.wallpaperUrl = null;
updates.wallpaperColor = null;
} else {
const wallpaper = await DriveFile.findOne({
_id: ps.wallpaperId
});
if (wallpaper == null) throw new Error('wallpaper not found');
if (wallpaper.metadata.deletedAt) {
updates.wallpaperUrl = null;
} else {
updates.wallpaperUrl = getDriveFileUrl(wallpaper);
if (wallpaper.metadata.properties.avgColor) {
updates.wallpaperColor = wallpaper.metadata.properties.avgColor;
}
}
if (banner.properties.avgColor) {
updates.bannerColor = banner.properties.avgColor;
}
}
//#region emojis/tags
if (updates.name != null || updates.description != null) {
let emojis = [] as string[];
let tags = [] as string[];
let emojis = [] as string[];
let tags = [] as string[];
if (updates.name != null) {
const tokens = parsePlain(updates.name);
emojis = emojis.concat(extractEmojis(tokens));
}
if (updates.description != null) {
const tokens = parse(updates.description);
emojis = emojis.concat(extractEmojis(tokens));
tags = extractHashtags(tokens).map(tag => tag.toLowerCase());
}
updates.emojis = emojis;
updates.tags = tags;
// ハッシュタグ更新
for (const tag of tags) updateHashtag(user, tag, true, true);
for (const tag of (user.tags || []).filter(x => !tags.includes(x))) updateHashtag(user, tag, true, false);
if (updates.name != null) {
const tokens = parsePlain(updates.name);
emojis = emojis.concat(extractEmojis(tokens));
}
if (updates.description != null) {
const tokens = parse(updates.description);
emojis = emojis.concat(extractEmojis(tokens));
tags = extractHashtags(tokens).map(tag => tag.toLowerCase());
}
updates.emojis = emojis;
updates.tags = tags;
// ハッシュタグ更新
for (const tag of tags) updateHashtag(user, tag, true, true);
for (const tag of user.tags.filter(x => !tags.includes(x))) updateHashtag(user, tag, true, false);
//#endregion
await User.update(user._id, {
$set: updates
});
await Users.update(user.id, updates);
const iObj = await pack(user._id, user, {
const iObj = await Users.pack(user.id, user, {
detail: true,
includeSecrets: isSecure
});
// Publish meUpdated event
publishMainStream(user._id, 'meUpdated', iObj);
publishMainStream(user.id, 'meUpdated', iObj);
// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
if (user.isLocked && ps.isLocked === false) {
@@ -288,7 +236,7 @@ export default define(meta, async (ps, user, app) => {
}
// フォロワーにUpdateを配信
publishToFollowers(user._id);
publishToFollowers(user.id);
return iObj;
});