summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/games
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-07 21:50:36 +0900
committerGitHub <noreply@github.com>2019-04-07 21:50:36 +0900
commitf0a29721c9fb10f97faf386bc9d6b1b2fad97895 (patch)
treeb5c1d38d698589bb444c0881a431391db91eb5bc /src/server/api/endpoints/games
parentUpdate README.md [AUTOGEN] (#4639) (diff)
downloadsharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.gz
sharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.bz2
sharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.zip
Use PostgreSQL instead of MongoDB (#4572)
* 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 * :v: * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * :pizza: * 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 * :v: * clean up * docs * Update push.ts * wip * Update api.ts * wip * :v: * Update make-pagination-query.ts * :v: * 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 * :art: * 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 * :v: * 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 * :art: * 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 * :v: * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * :sushi: * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * :clock4: * Fix bug * Add test * Add test * rename * Fix bug
Diffstat (limited to 'src/server/api/endpoints/games')
-rw-r--r--src/server/api/endpoints/games/reversi/games.ts45
-rw-r--r--src/server/api/endpoints/games/reversi/games/show.ts20
-rw-r--r--src/server/api/endpoints/games/reversi/games/surrender.ts29
-rw-r--r--src/server/api/endpoints/games/reversi/invitations.ts12
-rw-r--r--src/server/api/endpoints/games/reversi/match.ts65
-rw-r--r--src/server/api/endpoints/games/reversi/match/cancel.ts8
6 files changed, 73 insertions, 106 deletions
diff --git a/src/server/api/endpoints/games/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts
index e3c22c7611..07736e0424 100644
--- a/src/server/api/endpoints/games/reversi/games.ts
+++ b/src/server/api/endpoints/games/reversi/games.ts
@@ -1,7 +1,9 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import ReversiGame, { pack } from '../../../../../models/games/reversi/game';
+import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
+import { ReversiGames } from '../../../../../models';
+import { makePaginationQuery } from '../../../common/make-pagination-query';
+import { Brackets } from 'typeorm';
export const meta = {
tags: ['games'],
@@ -14,12 +16,10 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
- transform: transform,
},
untilId: {
validator: $.optional.type(ID),
- transform: transform,
},
my: {
@@ -30,39 +30,20 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const q: any = ps.my ? {
- isStarted: true,
- $or: [{
- user1Id: user._id
- }, {
- user2Id: user._id
- }]
- } : {
- isStarted: true
- };
+ const query = makePaginationQuery(ReversiGames.createQueryBuilder('game'), ps.sinceId, ps.untilId)
+ .andWhere('game.isStarted = TRUE');
- const sort = {
- _id: -1
- };
-
- if (ps.sinceId) {
- sort._id = 1;
- q._id = {
- $gt: ps.sinceId
- };
- } else if (ps.untilId) {
- q._id = {
- $lt: ps.untilId
- };
+ if (ps.my) {
+ query.andWhere(new Brackets(qb => { qb
+ .where('game.user1Id = :userId', { userId: user.id })
+ .orWhere('game.user2Id = :userId', { userId: user.id });
+ }));
}
// Fetch games
- const games = await ReversiGame.find(q, {
- sort: sort,
- limit: ps.limit
- });
+ const games = await query.take(ps.limit).getMany();
- return await Promise.all(games.map((g) => pack(g, user, {
+ return await Promise.all(games.map((g) => ReversiGames.pack(g, user, {
detail: false
})));
});
diff --git a/src/server/api/endpoints/games/reversi/games/show.ts b/src/server/api/endpoints/games/reversi/games/show.ts
index 766ca90119..ea2776b16f 100644
--- a/src/server/api/endpoints/games/reversi/games/show.ts
+++ b/src/server/api/endpoints/games/reversi/games/show.ts
@@ -1,9 +1,9 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../../misc/cafy-id';
-import ReversiGame, { pack } from '../../../../../../models/games/reversi/game';
+import { ID } from '../../../../../../misc/cafy-id';
import Reversi from '../../../../../../games/reversi/core';
import define from '../../../../define';
import { ApiError } from '../../../../error';
+import { ReversiGames } from '../../../../../../models';
export const meta = {
tags: ['games'],
@@ -11,7 +11,6 @@ export const meta = {
params: {
gameId: {
validator: $.type(ID),
- transform: transform,
},
},
@@ -25,22 +24,23 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const game = await ReversiGame.findOne({ _id: ps.gameId });
+ const game = await ReversiGames.findOne(ps.gameId);
if (game == null) {
throw new ApiError(meta.errors.noSuchGame);
}
- const o = new Reversi(game.settings.map, {
- isLlotheo: game.settings.isLlotheo,
- canPutEverywhere: game.settings.canPutEverywhere,
- loopedBoard: game.settings.loopedBoard
+ const o = new Reversi(game.map, {
+ isLlotheo: game.isLlotheo,
+ canPutEverywhere: game.canPutEverywhere,
+ loopedBoard: game.loopedBoard
});
- for (const log of game.logs)
+ for (const log of game.logs) {
o.put(log.color, log.pos);
+ }
- const packed = await pack(game, user);
+ const packed = await ReversiGames.pack(game, user);
return Object.assign({
board: o.board,
diff --git a/src/server/api/endpoints/games/reversi/games/surrender.ts b/src/server/api/endpoints/games/reversi/games/surrender.ts
index 446210894d..56d66fb205 100644
--- a/src/server/api/endpoints/games/reversi/games/surrender.ts
+++ b/src/server/api/endpoints/games/reversi/games/surrender.ts
@@ -1,9 +1,9 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../../misc/cafy-id';
-import ReversiGame, { pack } from '../../../../../../models/games/reversi/game';
+import { ID } from '../../../../../../misc/cafy-id';
import { publishReversiGameStream } from '../../../../../../services/stream';
import define from '../../../../define';
import { ApiError } from '../../../../error';
+import { ReversiGames } from '../../../../../../models';
export const meta = {
tags: ['games'],
@@ -17,7 +17,6 @@ export const meta = {
params: {
gameId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '投了したい対局'
}
@@ -46,7 +45,7 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const game = await ReversiGame.findOne({ _id: ps.gameId });
+ const game = await ReversiGames.findOne(ps.gameId);
if (game == null) {
throw new ApiError(meta.errors.noSuchGame);
@@ -56,26 +55,20 @@ export default define(meta, async (ps, user) => {
throw new ApiError(meta.errors.alreadyEnded);
}
- if (!game.user1Id.equals(user._id) && !game.user2Id.equals(user._id)) {
+ if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) {
throw new ApiError(meta.errors.accessDenied);
}
- const winnerId = game.user1Id.equals(user._id) ? game.user2Id : game.user1Id;
+ const winnerId = game.user1Id === user.id ? game.user2Id : game.user1Id;
- await ReversiGame.update({
- _id: game._id
- }, {
- $set: {
- surrendered: user._id,
- isEnded: true,
- winnerId: winnerId
- }
+ await ReversiGames.update(game.id, {
+ surrendered: user.id,
+ isEnded: true,
+ winnerId: winnerId
});
- publishReversiGameStream(game._id, 'ended', {
+ publishReversiGameStream(game.id, 'ended', {
winnerId: winnerId,
- game: await pack(game._id, user)
+ game: await ReversiGames.pack(game.id, user)
});
-
- return;
});
diff --git a/src/server/api/endpoints/games/reversi/invitations.ts b/src/server/api/endpoints/games/reversi/invitations.ts
index c204770578..71f5aca1d1 100644
--- a/src/server/api/endpoints/games/reversi/invitations.ts
+++ b/src/server/api/endpoints/games/reversi/invitations.ts
@@ -1,5 +1,5 @@
-import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching';
import define from '../../../define';
+import { ReversiMatchings } from '../../../../../models';
export const meta = {
tags: ['games'],
@@ -9,13 +9,9 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Find session
- const invitations = await Matching.find({
- childId: user._id
- }, {
- sort: {
- _id: -1
- }
+ const invitations = await ReversiMatchings.find({
+ childId: user.id
});
- return await Promise.all(invitations.map((i) => packMatching(i, user)));
+ return await Promise.all(invitations.map((i) => ReversiMatchings.pack(i, user)));
});
diff --git a/src/server/api/endpoints/games/reversi/match.ts b/src/server/api/endpoints/games/reversi/match.ts
index e66765944d..e34d3c67f4 100644
--- a/src/server/api/endpoints/games/reversi/match.ts
+++ b/src/server/api/endpoints/games/reversi/match.ts
@@ -1,12 +1,14 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching';
-import ReversiGame, { pack as packGame } from '../../../../../models/games/reversi/game';
+import { ID } from '../../../../../misc/cafy-id';
import { publishMainStream, publishReversiStream } from '../../../../../services/stream';
import { eighteight } from '../../../../../games/reversi/maps';
import define from '../../../define';
import { ApiError } from '../../../error';
import { getUser } from '../../../common/getters';
+import { genId } from '../../../../../misc/gen-id';
+import { ReversiMatchings, ReversiGames } from '../../../../../models';
+import { ReversiGame } from '../../../../../models/entities/games/reversi/game';
+import { ReversiMatching } from '../../../../../models/entities/games/reversi/matching';
export const meta = {
tags: ['games'],
@@ -16,7 +18,6 @@ export const meta = {
params: {
userId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のユーザーのID',
'en-US': 'Target user ID'
@@ -41,50 +42,47 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Myself
- if (ps.userId.equals(user._id)) {
+ if (ps.userId === user.id) {
throw new ApiError(meta.errors.isYourself);
}
// Find session
- const exist = await Matching.findOne({
+ const exist = await ReversiMatchings.findOne({
parentId: ps.userId,
- childId: user._id
+ childId: user.id
});
if (exist) {
// Destroy session
- Matching.remove({
- _id: exist._id
- });
+ ReversiMatchings.delete(exist.id);
// Create game
- const game = await ReversiGame.insert({
+ const game = await ReversiGames.save({
+ id: genId(),
createdAt: new Date(),
user1Id: exist.parentId,
- user2Id: user._id,
+ user2Id: user.id,
user1Accepted: false,
user2Accepted: false,
isStarted: false,
isEnded: false,
logs: [],
- settings: {
- map: eighteight.data,
- bw: 'random',
- isLlotheo: false
- }
- });
+ map: eighteight.data,
+ bw: 'random',
+ isLlotheo: false
+ } as ReversiGame);
- publishReversiStream(exist.parentId, 'matched', await packGame(game, exist.parentId));
+ publishReversiStream(exist.parentId, 'matched', await ReversiGames.pack(game, exist.parentId));
- const other = await Matching.count({
- childId: user._id
+ const other = await ReversiMatchings.count({
+ childId: user.id
});
if (other == 0) {
- publishMainStream(user._id, 'reversiNoInvites');
+ publishMainStream(user.id, 'reversiNoInvites');
}
- return await packGame(game, user);
+ return await ReversiGames.pack(game, user);
} else {
// Fetch child
const child = await getUser(ps.userId).catch(e => {
@@ -93,21 +91,22 @@ export default define(meta, async (ps, user) => {
});
// 以前のセッションはすべて削除しておく
- await Matching.remove({
- parentId: user._id
+ await ReversiMatchings.delete({
+ parentId: user.id
});
// セッションを作成
- const matching = await Matching.insert({
+ const matching = await ReversiMatchings.save({
+ id: genId(),
createdAt: new Date(),
- parentId: user._id,
- childId: child._id
- });
+ parentId: user.id,
+ childId: child.id
+ } as ReversiMatching);
- const packed = await packMatching(matching, child);
- publishReversiStream(child._id, 'invited', packed);
- publishMainStream(child._id, 'reversiInvited', packed);
+ const packed = await ReversiMatchings.pack(matching, child);
+ publishReversiStream(child.id, 'invited', packed);
+ publishMainStream(child.id, 'reversiInvited', packed);
- return;
+ return null;
}
});
diff --git a/src/server/api/endpoints/games/reversi/match/cancel.ts b/src/server/api/endpoints/games/reversi/match/cancel.ts
index fb230032d8..71aaae5ee1 100644
--- a/src/server/api/endpoints/games/reversi/match/cancel.ts
+++ b/src/server/api/endpoints/games/reversi/match/cancel.ts
@@ -1,5 +1,5 @@
-import Matching from '../../../../../../models/games/reversi/matching';
import define from '../../../../define';
+import { ReversiMatchings } from '../../../../../../models';
export const meta = {
tags: ['games'],
@@ -8,9 +8,7 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- await Matching.remove({
- parentId: user._id
+ await ReversiMatchings.delete({
+ parentId: user.id
});
-
- return;
});