Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
592 changed files with 13463 additions and 14147 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/remote/activitypub/kernel/accept/follow.ts
View file

@ -1,8 +1,8 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import config from '../../../../config';
import accept from '../../../../services/following/requests/accept';
import { IFollow } from '../../type';
import { Users } from '../../../../models';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
@ -11,11 +11,11 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
return null;
}
const follower = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
const follower = await Users.findOne({
id: id.split('/').pop()
});
if (follower === null) {
if (follower == null) {
throw new Error('follower not found');
}

2
src/remote/activitypub/kernel/accept/index.ts
View file

@ -1,5 +1,5 @@
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import acceptFollow from './follow';
import { IAccept, IFollow } from '../../type';
import { apLogger } from '../../logger';

4
src/remote/activitypub/kernel/add/index.ts
View file

@ -1,4 +1,4 @@
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { IAdd } from '../../type';
import { resolveNote } from '../../models/note';
import { addPinned } from '../../../../services/i/pin';
@ -14,7 +14,7 @@ export default async (actor: IRemoteUser, activity: IAdd): Promise<void> => {
if (activity.target === actor.featured) {
const note = await resolveNote(activity.object);
await addPinned(actor, note._id);
await addPinned(actor, note.id);
return;
}

2
src/remote/activitypub/kernel/announce/index.ts
View file

@ -1,5 +1,5 @@
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import announceNote from './note';
import { IAnnounce, INote } from '../../type';
import { apLogger } from '../../logger';

10
src/remote/activitypub/kernel/announce/note.ts
View file

@ -1,12 +1,12 @@
import Resolver from '../../resolver';
import post from '../../../../services/note/create';
import { IRemoteUser, IUser } from '../../../../models/user';
import { IRemoteUser, User } from '../../../../models/entities/user';
import { IAnnounce, INote } from '../../type';
import { fetchNote, resolveNote } from '../../models/note';
import { resolvePerson } from '../../models/person';
import { apLogger } from '../../logger';
import { extractDbHost } from '../../../../misc/convert-host';
import Instance from '../../../../models/instance';
import fetchMeta from '../../../../misc/fetch-meta';
const logger = apLogger;
@ -27,8 +27,8 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
// アナウンス先をブロックしてたら中断
// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
const instance = await Instance.findOne({ host: extractDbHost(uri) });
if (instance && instance.isBlocked) return;
const meta = await fetchMeta();
if (meta.blockedHosts.includes(extractDbHost(uri))) return;
// 既に同じURIを持つものが登録されていないかチェック
const exist = await fetchNote(uri);
@ -55,7 +55,7 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
//#region Visibility
const visibility = getVisibility(activity.to, activity.cc, actor);
let visibleUsers: IUser[] = [];
let visibleUsers: User[] = [];
if (visibility == 'specified') {
visibleUsers = await Promise.all(note.to.map(uri => resolvePerson(uri)));
}

10
src/remote/activitypub/kernel/block/index.ts
View file

@ -1,9 +1,9 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../../models/user';
import config from '../../../../config';
import { IBlock } from '../../type';
import block from '../../../../services/blocking/create';
import { apLogger } from '../../logger';
import { Users } from '../../../../models';
import { IRemoteUser } from '../../../../models/entities/user';
const logger = apLogger;
@ -18,11 +18,9 @@ export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
return null;
}
const blockee = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
});
const blockee = await Users.findOne(id.split('/').pop());
if (blockee === null) {
if (blockee == null) {
throw new Error('blockee not found');
}

2
src/remote/activitypub/kernel/create/image.ts
View file

@ -1,4 +1,4 @@
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { createImage } from '../../models/image';
export default async function(actor: IRemoteUser, image: any): Promise<void> {

2
src/remote/activitypub/kernel/create/index.ts
View file

@ -1,5 +1,5 @@
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import createImage from './image';
import createNote from './note';
import { ICreate } from '../../type';

2
src/remote/activitypub/kernel/create/note.ts
View file

@ -1,5 +1,5 @@
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { createNote, fetchNote } from '../../models/note';
/**

6
src/remote/activitypub/kernel/delete/index.ts
View file

@ -1,9 +1,9 @@
import Resolver from '../../resolver';
import deleteNote from './note';
import Note from '../../../../models/note';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { IDelete } from '../../type';
import { apLogger } from '../../logger';
import { Notes } from '../../../../models';
/**
* 削除アクティビティを捌きます
@ -27,7 +27,7 @@ export default async (actor: IRemoteUser, activity: IDelete): Promise<void> => {
break;
case 'Tombstone':
const note = await Note.findOne({ uri });
const note = await Notes.findOne({ uri });
if (note != null) {
deleteNote(actor, uri);
}

8
src/remote/activitypub/kernel/delete/note.ts
View file

@ -1,20 +1,20 @@
import Note from '../../../../models/note';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import deleteNode from '../../../../services/note/delete';
import { apLogger } from '../../logger';
import { Notes } from '../../../../models';
const logger = apLogger;
export default async function(actor: IRemoteUser, uri: string): Promise<void> {
logger.info(`Deleting the Note: ${uri}`);
const note = await Note.findOne({ uri });
const note = await Notes.findOne({ uri });
if (note == null) {
throw new Error('note not found');
}
if (!note.userId.equals(actor._id)) {
if (note.userId !== actor.id) {
throw new Error('投稿を削除しようとしているユーザーは投稿の作成者ではありません');
}

10
src/remote/activitypub/kernel/follow.ts
View file

@ -1,8 +1,8 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../models/user';
import { IRemoteUser } from '../../../models/entities/user';
import config from '../../../config';
import follow from '../../../services/following/create';
import { IFollow } from '../type';
import { Users } from '../../../models';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
@ -11,11 +11,9 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
return null;
}
const followee = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
});
const followee = await Users.findOne(id.split('/').pop());
if (followee === null) {
if (followee == null) {
throw new Error('followee not found');
}

2
src/remote/activitypub/kernel/index.ts
View file

@ -1,5 +1,5 @@
import { Object } from '../type';
import { IRemoteUser } from '../../../models/user';
import { IRemoteUser } from '../../../models/entities/user';
import create from './create';
import performDeleteActivity from './delete';
import performUpdateActivity from './update';

11
src/remote/activitypub/kernel/like.ts
View file

@ -1,8 +1,7 @@
import * as mongo from 'mongodb';
import Note from '../../../models/note';
import { IRemoteUser } from '../../../models/user';
import { IRemoteUser } from '../../../models/entities/user';
import { ILike } from '../type';
import create from '../../../services/note/reaction/create';
import { Notes } from '../../../models';
export default async (actor: IRemoteUser, activity: ILike) => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
@ -10,10 +9,10 @@ export default async (actor: IRemoteUser, activity: ILike) => {
// Transform:
// https://misskey.ex/notes/xxxx to
// xxxx
const noteId = new mongo.ObjectID(id.split('/').pop());
const noteId = id.split('/').pop();
const note = await Note.findOne({ _id: noteId });
if (note === null) {
const note = await Notes.findOne(noteId);
if (note == null) {
throw new Error();
}

10
src/remote/activitypub/kernel/reject/follow.ts
View file

@ -1,8 +1,8 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import config from '../../../../config';
import reject from '../../../../services/following/requests/reject';
import { IFollow } from '../../type';
import { Users } from '../../../../models';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
@ -11,11 +11,9 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
return null;
}
const follower = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
});
const follower = await Users.findOne(id.split('/').pop());
if (follower === null) {
if (follower == null) {
throw new Error('follower not found');
}

2
src/remote/activitypub/kernel/reject/index.ts
View file

@ -1,5 +1,5 @@
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import rejectFollow from './follow';
import { IReject, IFollow } from '../../type';
import { apLogger } from '../../logger';

4
src/remote/activitypub/kernel/remove/index.ts
View file

@ -1,4 +1,4 @@
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { IRemove } from '../../type';
import { resolveNote } from '../../models/note';
import { removePinned } from '../../../../services/i/pin';
@ -14,7 +14,7 @@ export default async (actor: IRemoteUser, activity: IRemove): Promise<void> => {
if (activity.target === actor.featured) {
const note = await resolveNote(activity.object);
await removePinned(actor, note._id);
await removePinned(actor, note.id);
return;
}

10
src/remote/activitypub/kernel/undo/block.ts
View file

@ -1,9 +1,9 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../../models/user';
import config from '../../../../config';
import { IBlock } from '../../type';
import unblock from '../../../../services/blocking/delete';
import { apLogger } from '../../logger';
import { IRemoteUser } from '../../../../models/entities/user';
import { Users } from '../../../../models';
const logger = apLogger;
@ -18,11 +18,9 @@ export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
return null;
}
const blockee = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
});
const blockee = await Users.findOne(id.split('/').pop());
if (blockee === null) {
if (blockee == null) {
throw new Error('blockee not found');
}

24
src/remote/activitypub/kernel/undo/follow.ts
View file

@ -1,11 +1,9 @@
import * as mongo from 'mongodb';
import User, { IRemoteUser } from '../../../../models/user';
import config from '../../../../config';
import unfollow from '../../../../services/following/delete';
import cancelRequest from '../../../../services/following/requests/cancel';
import { IFollow } from '../../type';
import FollowRequest from '../../../../models/follow-request';
import Following from '../../../../models/following';
import { IRemoteUser } from '../../../../models/entities/user';
import { Users, FollowRequests, Followings } from '../../../../models';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
@ -14,11 +12,9 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
return null;
}
const followee = await User.findOne({
_id: new mongo.ObjectID(id.split('/').pop())
});
const followee = await Users.findOne(id.split('/').pop());
if (followee === null) {
if (followee == null) {
throw new Error('followee not found');
}
@ -26,14 +22,14 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
throw new Error('フォロー解除しようとしているユーザーはローカルユーザーではありません');
}
const req = await FollowRequest.findOne({
followerId: actor._id,
followeeId: followee._id
const req = await FollowRequests.findOne({
followerId: actor.id,
followeeId: followee.id
});
const following = await Following.findOne({
followerId: actor._id,
followeeId: followee._id
const following = await Followings.findOne({
followerId: actor.id,
followeeId: followee.id
});
if (req) {

2
src/remote/activitypub/kernel/undo/index.ts
View file

@ -1,4 +1,4 @@
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { IUndo, IFollow, IBlock, ILike } from '../../type';
import unfollow from './follow';
import unblock from './block';

11
src/remote/activitypub/kernel/undo/like.ts
View file

@ -1,8 +1,7 @@
import * as mongo from 'mongodb';
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { ILike } from '../../type';
import Note from '../../../../models/note';
import deleteReaction from '../../../../services/note/reaction/delete';
import { Notes } from '../../../../models';
/**
* Process Undo.Like activity
@ -10,10 +9,10 @@ import deleteReaction from '../../../../services/note/reaction/delete';
export default async (actor: IRemoteUser, activity: ILike): Promise<void> => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
const noteId = new mongo.ObjectID(id.split('/').pop());
const noteId = id.split('/').pop();
const note = await Note.findOne({ _id: noteId });
if (note === null) {
const note = await Notes.findOne(noteId);
if (note == null) {
throw 'note not found';
}

2
src/remote/activitypub/kernel/update/index.ts
View file

@ -1,4 +1,4 @@
import { IRemoteUser } from '../../../../models/user';
import { IRemoteUser } from '../../../../models/entities/user';
import { IUpdate, IObject } from '../../type';
import { apLogger } from '../../logger';
import { updateQuestion } from '../../models/question';