From 6a5c6280ffd3ffe820beb23294f1c2c1f5deb9cf Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 7 Oct 2017 03:36:46 +0900
Subject: :v:

---
 src/common/get-post-summary.js | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 src/common/get-post-summary.js

(limited to 'src/common')

diff --git a/src/common/get-post-summary.js b/src/common/get-post-summary.js
new file mode 100644
index 0000000000..f7a481a164
--- /dev/null
+++ b/src/common/get-post-summary.js
@@ -0,0 +1,39 @@
+/**
+ * 投稿を表す文字列を取得します。
+ * @param {*} post 投稿
+ */
+const summarize = post => {
+	let summary = post.text ? post.text : '';
+
+	// メディアが添付されているとき
+	if (post.media) {
+		summary += ` (${post.media.length}つのメディア)`;
+	}
+
+	// 投票が添付されているとき
+	if (post.poll) {
+		summary += ' (投票)';
+	}
+
+	// 返信のとき
+	if (post.reply_to_id) {
+		if (post.reply_to) {
+			summary += ` RE: ${summarize(post.reply_to)}`;
+		} else {
+			summary += ' RE: ...';
+		}
+	}
+
+	// Repostのとき
+	if (post.repost_id) {
+		if (post.repost) {
+			summary += ` RP: ${summarize(post.repost)}`;
+		} else {
+			summary += ' RP: ...';
+		}
+	}
+
+	return summary.trim();
+};
+
+export default summarize;
-- 
cgit v1.2.3-freya


From fe98dd927de6906671dfd3aa9671080ab6a065c6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 7 Oct 2017 06:58:50 +0900
Subject: :v:

---
 package.json                                     |  3 +-
 src/api/bot/core.ts                              |  6 ++--
 src/common/get-post-summary.js                   | 39 ------------------------
 src/common/get-post-summary.ts                   | 39 ++++++++++++++++++++++++
 src/web/app/desktop/script.js                    |  2 +-
 src/web/app/desktop/tags/notifications.tag       |  2 +-
 src/web/app/desktop/tags/pages/home.tag          |  2 +-
 src/web/app/mobile/tags/notification-preview.tag |  2 +-
 src/web/app/mobile/tags/notification.tag         |  2 +-
 src/web/app/mobile/tags/notifications.tag        |  2 +-
 src/web/app/mobile/tags/page/home.tag            |  2 +-
 src/web/app/mobile/tags/post-detail.tag          |  2 +-
 src/web/app/mobile/tags/timeline.tag             |  2 +-
 src/web/app/mobile/tags/user.tag                 |  2 +-
 webpack/module/rules/index.ts                    |  4 ++-
 webpack/module/rules/typescript.ts               |  8 +++++
 16 files changed, 66 insertions(+), 53 deletions(-)
 delete mode 100644 src/common/get-post-summary.js
 create mode 100644 src/common/get-post-summary.ts
 create mode 100644 webpack/module/rules/typescript.ts

(limited to 'src/common')

diff --git a/package.json b/package.json
index 0336725bda..6a9e7e26f0 100644
--- a/package.json
+++ b/package.json
@@ -64,14 +64,15 @@
     "@types/webpack": "3.0.13",
     "@types/webpack-stream": "3.2.7",
     "@types/websocket": "0.0.34",
+    "awesome-typescript-loader": "^3.2.3",
     "chai": "4.1.2",
     "chai-http": "3.0.0",
     "css-loader": "0.28.7",
     "event-stream": "3.3.4",
     "gulp": "3.9.1",
     "gulp-cssnano": "2.1.2",
-    "gulp-imagemin": "3.4.0",
     "gulp-htmlmin": "3.0.0",
+    "gulp-imagemin": "3.4.0",
     "gulp-mocha": "4.3.1",
     "gulp-pug": "3.3.0",
     "gulp-rename": "1.2.2",
diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index cf2bdef1dc..57330e67eb 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -3,7 +3,7 @@ import * as bcrypt from 'bcryptjs';
 
 import User, { IUser } from '../models/user';
 
-import getPostSummary from '../../common/get-post-summary.js';
+import getPostSummary from '../../common/get-post-summary';
 
 export default class BotCore extends EventEmitter {
 	public user: IUser = null;
@@ -109,7 +109,9 @@ export default class BotCore extends EventEmitter {
 	public async getTl() {
 		if (this.user == null) return 'まずサインインしてください。';
 
-		const tl = await require('../endpoints/posts/timeline')({}, this.user);
+		const tl = await require('../endpoints/posts/timeline')({
+			limit: 5
+		}, this.user);
 
 		const text = tl
 			.map(post => getPostSummary(post))
diff --git a/src/common/get-post-summary.js b/src/common/get-post-summary.js
deleted file mode 100644
index f7a481a164..0000000000
--- a/src/common/get-post-summary.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 投稿を表す文字列を取得します。
- * @param {*} post 投稿
- */
-const summarize = post => {
-	let summary = post.text ? post.text : '';
-
-	// メディアが添付されているとき
-	if (post.media) {
-		summary += ` (${post.media.length}つのメディア)`;
-	}
-
-	// 投票が添付されているとき
-	if (post.poll) {
-		summary += ' (投票)';
-	}
-
-	// 返信のとき
-	if (post.reply_to_id) {
-		if (post.reply_to) {
-			summary += ` RE: ${summarize(post.reply_to)}`;
-		} else {
-			summary += ' RE: ...';
-		}
-	}
-
-	// Repostのとき
-	if (post.repost_id) {
-		if (post.repost) {
-			summary += ` RP: ${summarize(post.repost)}`;
-		} else {
-			summary += ' RP: ...';
-		}
-	}
-
-	return summary.trim();
-};
-
-export default summarize;
diff --git a/src/common/get-post-summary.ts b/src/common/get-post-summary.ts
new file mode 100644
index 0000000000..f628a32b41
--- /dev/null
+++ b/src/common/get-post-summary.ts
@@ -0,0 +1,39 @@
+/**
+ * 投稿を表す文字列を取得します。
+ * @param {*} post 投稿
+ */
+const summarize = (post: any): string => {
+	let summary = post.text ? post.text : '';
+
+	// メディアが添付されているとき
+	if (post.media) {
+		summary += ` (${post.media.length}つのメディア)`;
+	}
+
+	// 投票が添付されているとき
+	if (post.poll) {
+		summary += ' (投票)';
+	}
+
+	// 返信のとき
+	if (post.reply_to_id) {
+		if (post.reply_to) {
+			summary += ` RE: ${summarize(post.reply_to)}`;
+		} else {
+			summary += ' RE: ...';
+		}
+	}
+
+	// Repostのとき
+	if (post.repost_id) {
+		if (post.repost) {
+			summary += ` RP: ${summarize(post.repost)}`;
+		} else {
+			summary += ' RP: ...';
+		}
+	}
+
+	return summary.trim();
+};
+
+export default summarize;
diff --git a/src/web/app/desktop/script.js b/src/web/app/desktop/script.js
index e3dc8b7d96..46a7fce700 100644
--- a/src/web/app/desktop/script.js
+++ b/src/web/app/desktop/script.js
@@ -11,7 +11,7 @@ import * as riot from 'riot';
 import init from '../init';
 import route from './router';
 import fuckAdBlock from './scripts/fuck-ad-block';
-import getPostSummary from '../../../common/get-post-summary';
+import getPostSummary from '../../../common/get-post-summary.ts';
 
 /**
  * init
diff --git a/src/web/app/desktop/tags/notifications.tag b/src/web/app/desktop/tags/notifications.tag
index 4747d1c0f4..1046358ce9 100644
--- a/src/web/app/desktop/tags/notifications.tag
+++ b/src/web/app/desktop/tags/notifications.tag
@@ -207,7 +207,7 @@
 
 	</style>
 	<script>
-		import getPostSummary from '../../../../common/get-post-summary';
+		import getPostSummary from '../../../../common/get-post-summary.ts';
 		this.getPostSummary = getPostSummary;
 
 		this.mixin('i');
diff --git a/src/web/app/desktop/tags/pages/home.tag b/src/web/app/desktop/tags/pages/home.tag
index a56c546059..e8ba4023de 100644
--- a/src/web/app/desktop/tags/pages/home.tag
+++ b/src/web/app/desktop/tags/pages/home.tag
@@ -8,7 +8,7 @@
 	</style>
 	<script>
 		import Progress from '../../../common/scripts/loading';
-		import getPostSummary from '../../../../../common/get-post-summary';
+		import getPostSummary from '../../../../../common/get-post-summary.ts';
 
 		this.mixin('i');
 		this.mixin('api');
diff --git a/src/web/app/mobile/tags/notification-preview.tag b/src/web/app/mobile/tags/notification-preview.tag
index 36b4f5eda7..1fdcc57641 100644
--- a/src/web/app/mobile/tags/notification-preview.tag
+++ b/src/web/app/mobile/tags/notification-preview.tag
@@ -110,7 +110,7 @@
 
 	</style>
 	<script>
-		import getPostSummary from '../../../../common/get-post-summary';
+		import getPostSummary from '../../../../common/get-post-summary.ts';
 		this.getPostSummary = getPostSummary;
 		this.notification = this.opts.notification;
 	</script>
diff --git a/src/web/app/mobile/tags/notification.tag b/src/web/app/mobile/tags/notification.tag
index 416493ee23..53222b9dbe 100644
--- a/src/web/app/mobile/tags/notification.tag
+++ b/src/web/app/mobile/tags/notification.tag
@@ -163,7 +163,7 @@
 
 	</style>
 	<script>
-		import getPostSummary from '../../../../common/get-post-summary';
+		import getPostSummary from '../../../../common/get-post-summary.ts';
 		this.getPostSummary = getPostSummary;
 		this.notification = this.opts.notification;
 	</script>
diff --git a/src/web/app/mobile/tags/notifications.tag b/src/web/app/mobile/tags/notifications.tag
index 9985b3351c..7370aa84d3 100644
--- a/src/web/app/mobile/tags/notifications.tag
+++ b/src/web/app/mobile/tags/notifications.tag
@@ -78,7 +78,7 @@
 
 	</style>
 	<script>
-		import getPostSummary from '../../../../common/get-post-summary';
+		import getPostSummary from '../../../../common/get-post-summary.ts';
 		this.getPostSummary = getPostSummary;
 
 		this.mixin('api');
diff --git a/src/web/app/mobile/tags/page/home.tag b/src/web/app/mobile/tags/page/home.tag
index 6f7369798e..3b0255b293 100644
--- a/src/web/app/mobile/tags/page/home.tag
+++ b/src/web/app/mobile/tags/page/home.tag
@@ -9,7 +9,7 @@
 	<script>
 		import ui from '../../scripts/ui-event';
 		import Progress from '../../../common/scripts/loading';
-		import getPostSummary from '../../../../../common/get-post-summary';
+		import getPostSummary from '../../../../../common/get-post-summary.ts';
 		import openPostForm from '../../scripts/open-post-form';
 
 		this.mixin('i');
diff --git a/src/web/app/mobile/tags/post-detail.tag b/src/web/app/mobile/tags/post-detail.tag
index 4be1a8080a..ed275749ec 100644
--- a/src/web/app/mobile/tags/post-detail.tag
+++ b/src/web/app/mobile/tags/post-detail.tag
@@ -264,7 +264,7 @@
 	</style>
 	<script>
 		import compile from '../../common/scripts/text-compiler';
-		import getPostSummary from '../../../../common/get-post-summary';
+		import getPostSummary from '../../../../common/get-post-summary.ts';
 		import openPostForm from '../scripts/open-post-form';
 
 		this.mixin('api');
diff --git a/src/web/app/mobile/tags/timeline.tag b/src/web/app/mobile/tags/timeline.tag
index 80debbf66e..5ecc2df9d1 100644
--- a/src/web/app/mobile/tags/timeline.tag
+++ b/src/web/app/mobile/tags/timeline.tag
@@ -464,7 +464,7 @@
 	</style>
 	<script>
 		import compile from '../../common/scripts/text-compiler';
-		import getPostSummary from '../../../../common/get-post-summary';
+		import getPostSummary from '../../../../common/get-post-summary.ts';
 		import openPostForm from '../scripts/open-post-form';
 
 		this.mixin('api');
diff --git a/src/web/app/mobile/tags/user.tag b/src/web/app/mobile/tags/user.tag
index cc34074218..a332e930e2 100644
--- a/src/web/app/mobile/tags/user.tag
+++ b/src/web/app/mobile/tags/user.tag
@@ -428,7 +428,7 @@
 
 	</style>
 	<script>
-		import summary from '../../../../common/get-post-summary';
+		import summary from '../../../../common/get-post-summary.ts';
 
 		this.post = this.opts.post;
 		this.text = summary(this.post);
diff --git a/webpack/module/rules/index.ts b/webpack/module/rules/index.ts
index 2308f4e535..2707a9c2f1 100644
--- a/webpack/module/rules/index.ts
+++ b/webpack/module/rules/index.ts
@@ -2,10 +2,12 @@ import i18n from './i18n';
 import themeColor from './theme-color';
 import tag from './tag';
 import stylus from './stylus';
+import typescript from './typescript';
 
 export default (lang, locale) => [
 	i18n(lang, locale),
 	themeColor(),
 	tag(),
-	stylus()
+	stylus(),
+	typescript()
 ];
diff --git a/webpack/module/rules/typescript.ts b/webpack/module/rules/typescript.ts
new file mode 100644
index 0000000000..eb2b279a55
--- /dev/null
+++ b/webpack/module/rules/typescript.ts
@@ -0,0 +1,8 @@
+/**
+ * TypeScript
+ */
+
+export default () => ({
+	test: /\.ts$/,
+	use: 'awesome-typescript-loader'
+});
-- 
cgit v1.2.3-freya


From d1f5d62251526c01b23e741ec363152cc21cc58c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 7 Oct 2017 17:20:47 +0900
Subject: Refactor

---
 src/api/bot/core.ts            | 18 ++++++++++--------
 src/common/get-user-summary.ts | 12 ++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 src/common/get-user-summary.ts

(limited to 'src/common')

diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index 5038665573..4970f24469 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -4,14 +4,12 @@ import * as bcrypt from 'bcryptjs';
 import User, { IUser, init as initUser } from '../models/user';
 
 import getPostSummary from '../../common/get-post-summary';
+import getUserSummary from '../../common/get-user-summary';
 
-function getUserSummary(user: IUser): string {
-	return `${user.name} (@${user.username})\n` +
-		`${user.posts_count}投稿、${user.following_count}フォロー、${user.followers_count}フォロワー\n` +
-		`場所: ${user.profile.location}、誕生日: ${user.profile.birthday}\n` +
-		`「${user.description}」`;
-}
 
+/**
+ * Botの頭脳
+ */
 export default class BotCore extends EventEmitter {
 	public user: IUser = null;
 
@@ -23,6 +21,10 @@ export default class BotCore extends EventEmitter {
 		this.user = user;
 	}
 
+	public clearContext() {
+		this.setContext(null);
+	}
+
 	public setContext(context: Context) {
 		this.context = context;
 		this.emit('updated');
@@ -178,7 +180,7 @@ class SigninContext extends Context {
 
 			if (same) {
 				this.core.signin(this.temporaryUser);
-				this.core.setContext(null);
+				this.core.clearContext();
 				return `${this.temporaryUser.name}さん、おかえりなさい！`;
 			} else {
 				return `パスワードが違います... もう一度教えてください:`;
@@ -211,7 +213,7 @@ class PostContext extends Context {
 		await require('../endpoints/posts/create')({
 			text: query
 		}, this.core.user);
-		this.core.setContext(null);
+		this.core.clearContext();
 		return '投稿しましたよ！';
 	}
 
diff --git a/src/common/get-user-summary.ts b/src/common/get-user-summary.ts
new file mode 100644
index 0000000000..1bec2f9a26
--- /dev/null
+++ b/src/common/get-user-summary.ts
@@ -0,0 +1,12 @@
+import { IUser } from '../api/models/user';
+
+/**
+ * ユーザーを表す文字列を取得します。
+ * @param user ユーザー
+ */
+export default function(user: IUser): string {
+	return `${user.name} (@${user.username})\n` +
+		`${user.posts_count}投稿、${user.following_count}フォロー、${user.followers_count}フォロワー\n` +
+		`場所: ${user.profile.location}、誕生日: ${user.profile.birthday}\n` +
+		`「${user.description}」`;
+}
-- 
cgit v1.2.3-freya


From b18e4fea9851ce0692b3f1a627c1d220d5f16b9c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 8 Oct 2017 03:24:10 +0900
Subject: :v:

---
 src/api/bot/core.ts            |  51 ++++++++
 src/api/bot/interfaces/line.ts | 112 ++++++++++-------
 src/common/othello.ts          | 275 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 393 insertions(+), 45 deletions(-)
 create mode 100644 src/common/othello.ts

(limited to 'src/common')

diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index bc5818d976..6042862d39 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -6,6 +6,8 @@ import User, { IUser, init as initUser } from '../models/user';
 import getPostSummary from '../../common/get-post-summary';
 import getUserSummary from '../../common/get-user-summary';
 
+import Othello, { ai as othelloAi } from '../../common/othello';
+
 /**
  * Botの頭脳
  */
@@ -106,6 +108,11 @@ export default class BotCore extends EventEmitter {
 			case 'タイムライン':
 				return await this.tlCommand();
 
+			case 'othello':
+			case 'オセロ':
+				this.setContext(new OthelloContext(this));
+				return await this.context.greet();
+
 			default:
 				return '?';
 		}
@@ -124,6 +131,18 @@ export default class BotCore extends EventEmitter {
 		this.emit('updated');
 	}
 
+	public async refreshUser() {
+		this.user = await User.findOne({
+			_id: this.user._id
+		}, {
+			fields: {
+				data: false
+			}
+		});
+
+		this.emit('updated');
+	}
+
 	public async tlCommand(): Promise<string | void> {
 		if (this.user == null) return 'まずサインインしてください。';
 
@@ -166,6 +185,7 @@ abstract class Context extends EventEmitter {
 	}
 
 	public static import(bot: BotCore, data: any) {
+		if (data.type == 'othello') return OthelloContext.import(bot, data.content);
 		if (data.type == 'post') return PostContext.import(bot, data.content);
 		if (data.type == 'signin') return SigninContext.import(bot, data.content);
 		return null;
@@ -251,3 +271,34 @@ class PostContext extends Context {
 		return context;
 	}
 }
+
+class OthelloContext extends Context {
+	private othello: Othello = null;
+
+	public async greet(): Promise<string> {
+		this.othello = new Othello();
+		return this.othello.toPatternString('black');
+	}
+
+	public async q(query: string): Promise<string> {
+		this.othello.setByNumber('black', parseInt(query, 10));
+		othelloAi('white', this.othello);
+		return this.othello.toPatternString('black');
+	}
+
+	public export() {
+		return {
+			type: 'othello',
+			content: {
+				board: this.othello.board
+			}
+		};
+	}
+
+	public static import(bot: BotCore, data: any) {
+		const context = new OthelloContext(bot);
+		context.othello = new Othello();
+		context.othello.board = data.board;
+		return context;
+	}
+}
diff --git a/src/api/bot/interfaces/line.ts b/src/api/bot/interfaces/line.ts
index 2bf62c1f6c..0caa71ed2b 100644
--- a/src/api/bot/interfaces/line.ts
+++ b/src/api/bot/interfaces/line.ts
@@ -50,38 +50,44 @@ class LineBot extends BotCore {
 	public async react(ev: any): Promise<void> {
 		this.replyToken = ev.replyToken;
 
-		// メッセージ
-		if (ev.type == 'message') {
-			// テキスト
-			if (ev.message.type == 'text') {
-				const res = await this.q(ev.message.text);
-
-				if (res == null) return;
-
-				// 返信
-				this.reply([{
-					type: 'text',
-					text: res
-				}]);
-			// スタンプ
-			} else if (ev.message.type == 'sticker') {
-				// スタンプで返信
-				this.reply([{
-					type: 'sticker',
-					packageId: '4',
-					stickerId: stickers[Math.floor(Math.random() * stickers.length)]
-				}]);
-			}
-		// postback
-		} else if (ev.type == 'postback') {
-			const data = ev.postback.data;
-			const cmd = data.split('|')[0];
-			const arg = data.split('|')[1];
-			switch (cmd) {
-				case 'showtl':
-					this.showUserTimelinePostback(arg);
-					break;
-			}
+		switch (ev.type) {
+			// メッセージ
+			case 'message':
+				switch (ev.message.type) {
+					// テキスト
+					case 'text':
+						const res = await this.q(ev.message.text);
+						if (res == null) return;
+						// 返信
+						this.reply([{
+							type: 'text',
+							text: res
+						}]);
+						break;
+
+					// スタンプ
+					case 'sticker':
+						// スタンプで返信
+						this.reply([{
+							type: 'sticker',
+							packageId: '4',
+							stickerId: stickers[Math.floor(Math.random() * stickers.length)]
+						}]);
+						break;
+				}
+				break;
+
+			// postback
+			case 'postback':
+				const data = ev.postback.data;
+				const cmd = data.split('|')[0];
+				const arg = data.split('|')[1];
+				switch (cmd) {
+					case 'showtl':
+						this.showUserTimelinePostback(arg);
+						break;
+				}
+				break;
 		}
 	}
 
@@ -96,6 +102,28 @@ class LineBot extends BotCore {
 			username: q.substr(1)
 		}, this.user);
 
+		const actions = [];
+
+		actions.push({
+			type: 'postback',
+			label: 'タイムラインを見る',
+			data: `showtl|${user.id}`
+		});
+
+		if (user.twitter) {
+			actions.push({
+				type: 'uri',
+				label: 'Twitterアカウントを見る',
+				uri: `https://twitter.com/${user.twitter.screen_name}`
+			});
+		}
+
+		actions.push({
+			type: 'uri',
+			label: 'Webで見る',
+			uri: `${config.url}/${user.username}`
+		});
+
 		this.reply([{
 			type: 'template',
 			altText: await super.showUserCommand(q),
@@ -104,15 +132,7 @@ class LineBot extends BotCore {
 				thumbnailImageUrl: `${user.avatar_url}?thumbnail&size=1024`,
 				title: `${user.name} (@${user.username})`,
 				text: user.description || '(no description)',
-				actions: [{
-					type: 'postback',
-					label: 'タイムラインを見る',
-					data: `showtl|${user.id}`
-				}, {
-					type: 'uri',
-					label: 'Webで見る',
-					uri: `${config.url}/${user.username}`
-				}]
+				actions: actions
 			}
 		}]);
 	}
@@ -123,7 +143,7 @@ class LineBot extends BotCore {
 			limit: 5
 		}, this.user);
 
-		const text = tl
+		const text = `${tl[0].user.name}さんのタイムラインはこちらです:\n\n` + tl
 			.map(post => getPostSummary(post))
 			.join('\n-----\n');
 
@@ -144,10 +164,10 @@ module.exports = async (app: express.Application) => {
 		const sourceId = ev.source.userId;
 		const sessionId = `line-bot-sessions:${sourceId}`;
 
-		const _session = await redis.get(sessionId);
+		const session = await redis.get(sessionId);
 		let bot: LineBot;
 
-		if (_session == null) {
+		if (session == null) {
 			const user = await User.findOne({
 				line: {
 					user_id: sourceId
@@ -178,13 +198,15 @@ module.exports = async (app: express.Application) => {
 
 			redis.set(sessionId, JSON.stringify(bot.export()));
 		} else {
-			bot = LineBot.import(JSON.parse(_session));
+			bot = LineBot.import(JSON.parse(session));
 		}
 
 		bot.on('updated', () => {
 			redis.set(sessionId, JSON.stringify(bot.export()));
 		});
 
+		if (session != null) bot.refreshUser();
+
 		bot.react(ev);
 	});
 
diff --git a/src/common/othello.ts b/src/common/othello.ts
new file mode 100644
index 0000000000..0060401976
--- /dev/null
+++ b/src/common/othello.ts
@@ -0,0 +1,275 @@
+import * as EventEmitter from 'events';
+
+export default class Othello extends EventEmitter {
+	public board: Array<Array<'black' | 'white'>>;
+
+	/**
+	 * ゲームを初期化します
+	 */
+	constructor() {
+		super();
+
+		this.board = [
+			[null, null, null, null, null, null, null, null],
+			[null, null, null, null, null, null, null, null],
+			[null, null, null, null, null, null, null, null],
+			[null, null, null, 'black', 'white', null, null, null],
+			[null, null, null, 'white', 'black', null, null, null],
+			[null, null, null, null, null, null, null, null],
+			[null, null, null, null, null, null, null, null],
+			[null, null, null, null, null, null, null, null]
+		];
+	}
+
+	public setByNumber(color, n) {
+		const ps = this.getPattern(color);
+		this.set(color, ps[n][0], ps[n][1]);
+	}
+
+	/**
+	 * 石を配置します
+	 */
+	public set(color, x, y) {
+		this.board[y][x] = color;
+
+		const reverses = this.getReverse(color, x, y);
+
+		reverses.forEach(r => {
+			switch (r[0]) {
+				case 0: // 上
+					for (let c = 0, _y = y - 1; c < r[1]; c++, _y--) {
+						this.board[x][_y] = color;
+					}
+					break;
+
+				case 1: // 右上
+					for (let c = 0, i = 1; c < r[1]; c++, i++) {
+						this.board[x + i][y - i] = color;
+					}
+					break;
+
+				case 2: // 右
+					for (let c = 0, _x = x + 1; c < r[1]; c++, _x++) {
+						this.board[_x][y] = color;
+					}
+					break;
+
+				case 3: // 右下
+					for (let c = 0, i = 1; c < r[1]; c++, i++) {
+						this.board[x + i][y + i] = color;
+					}
+					break;
+
+				case 4: // 下
+					for (let c = 0, _y = y + 1; c < r[1]; c++, _y++) {
+						this.board[x][_y] = color;
+					}
+					break;
+
+				case 5: // 左下
+					for (let c = 0, i = 1; c < r[1]; c++, i++) {
+						this.board[x - i][y + i] = color;
+					}
+					break;
+
+				case 6: // 左
+					for (let c = 0, _x = x - 1; c < r[1]; c++, _x--) {
+						this.board[_x][y] = color;
+					}
+					break;
+
+				case 7: // 左上
+					for (let c = 0, i = 1; c < r[1]; c++, i++) {
+						this.board[x - i][y - i] = color;
+					}
+					break;
+				}
+		});
+
+		this.emit('set:' + color, x, y);
+	}
+
+	/**
+	 * 打つことができる場所を取得します
+	 */
+	public getPattern(myColor): number[][] {
+		const result = [];
+		this.board.forEach((stones, y) => stones.forEach((stone, x) => {
+			if (stone != null) return;
+			if (this.canReverse(myColor, x, y)) result.push([x, y]);
+		}));
+		return result;
+	}
+
+	/**
+	 * 指定の位置に石を打つことができるかどうか(相手の石を1つでも反転させられるか)を取得します
+	 */
+	public canReverse(myColor, targetx, targety): boolean {
+		return this.getReverse(myColor, targetx, targety) !== null;
+	}
+
+	private getReverse(myColor, targetx, targety): number[] {
+		const opponentColor = myColor == 'black' ? 'white' : 'black';
+
+		const createIterater = () => {
+			let opponentStoneFound = false;
+			let breaked = false;
+			return (x, y): any => {
+				if (breaked) {
+					return;
+				} else if (this.board[x][y] == myColor && opponentStoneFound) {
+					return true;
+				} else if (this.board[x][y] == myColor && !opponentStoneFound) {
+					breaked = true;
+				} else if (this.board[x][y] == opponentColor) {
+					opponentStoneFound = true;
+				} else {
+					breaked = true;
+				}
+			};
+		};
+
+		const res = [];
+
+		let iterate;
+
+		// 上
+		iterate = createIterater();
+		for (let c = 0, y = targety - 1; y >= 0; c++, y--) {
+			if (iterate(targetx, y)) {
+				res.push([0, c]);
+				break;
+			}
+		}
+
+		// 右上
+		iterate = createIterater();
+		for (let c = 0, i = 1; i < Math.min(8 - targetx, targety); c++, i++) {
+			if (iterate(targetx + i, targety - i)) {
+				res.push([1, c]);
+				break;
+			}
+		}
+
+		// 右
+		iterate = createIterater();
+		for (let c = 0, x = targetx + 1; x < 8; c++, x++) {
+			if (iterate(x, targety)) {
+				res.push([2, c]);
+				break;
+			}
+		}
+
+		// 右下
+		iterate = createIterater();
+		for (let c = 0, i = 1; i < Math.min(8 - targetx, 8 - targety); c++, i++) {
+			if (iterate(targetx + i, targety + i)) {
+				res.push([3, c]);
+				break;
+			}
+		}
+
+		// 下
+		iterate = createIterater();
+		for (let c = 0, y = targety + 1; y < 8; c++, y++) {
+			if (iterate(targetx, y)) {
+				res.push([4, c]);
+				break;
+			}
+		}
+
+		// 左下
+		iterate = createIterater();
+		for (let c = 0, i = 1; i < Math.min(targetx, 8 - targety); c++, i++) {
+			if (iterate(targetx - i, targety + i)) {
+				res.push([5, c]);
+				break;
+			}
+		}
+
+		// 左
+		iterate = createIterater();
+		for (let c = 0, x = targetx - 1; x >= 0; c++, x--) {
+			if (iterate(x, targety)) {
+				res.push([6, c]);
+				break;
+			}
+		}
+
+		// 左上
+		iterate = createIterater();
+		for (let c = 0, i = 1; i < Math.min(targetx, targety); c++, i++) {
+			if (iterate(targetx - i, targety - i)) {
+				res.push([7, c]);
+				break;
+			}
+		}
+
+		return res.length === 0 ? null : res;
+	}
+
+	public toString(): string {
+		return this.board.map(row => row.map(state => state === 'black' ? '⚫️' : state === 'white' ? '⚪️' : '🔹').join('')).join('\n');
+	}
+
+	public toPatternString(color): string {
+		const num = ['0️⃣', '1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣', '6️⃣', '7️⃣', '8️⃣', '9️⃣', '🔟'];
+
+		const pattern = this.getPattern(color);
+
+		return this.board.map((row, y) => row.map((state, x) => {
+			const i = pattern.findIndex(p => p[0] == x && p[1] == y);
+			return state === 'black' ? '⚫️' : state === 'white' ? '⚪️' : i != -1 ? num[i] : '🔹';
+		}).join('')).join('\n');
+	}
+}
+/*
+export class Ai {
+	private othello: Othello;
+	private color: string;
+	private opponentColor: string;
+
+	constructor(color: string, othello: Othello) {
+		this.othello = othello;
+		this.color = color;
+		this.opponentColor = this.color == 'black' ? 'white' : 'black';
+
+		this.othello.on('set:' + this.opponentColor, () => {
+			this.turn();
+		});
+
+		if (this.color == 'black') {
+			this.turn();
+		}
+	}
+
+	public turn() {
+		const ps = this.othello.getPattern(this.color);
+		if (ps.length > 0) {
+			const p = ps[Math.floor(Math.random() * ps.length)];
+			this.othello.set(this.color, p[0], p[1]);
+
+			// 相手の打つ場所がない場合続けてAIのターン
+			if (this.othello.getPattern(this.opponentColor).length === 0) {
+				this.turn();
+			}
+		}
+	}
+}
+*/
+export function ai(color: string, othello: Othello) {
+	const opponentColor = color == 'black' ? 'white' : 'black';
+
+	function think() {
+		const ps = othello.getPattern(color);
+		if (ps.length > 0) {
+			const p = ps[Math.floor(Math.random() * ps.length)];
+			othello.set(color, p[0], p[1]);
+
+			// 相手の打つ場所がない場合続けてAIのターン
+			if (othello.getPattern(opponentColor).length === 0) {
+				think();
+			}
+		}
+	}
+}
-- 
cgit v1.2.3-freya


From c14f946bd493d0d57d0928ccb1e6b823b44cc98f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 8 Oct 2017 03:56:03 +0900
Subject: :v:

---
 src/common/othello.ts | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/common')

diff --git a/src/common/othello.ts b/src/common/othello.ts
index 0060401976..ef11514dff 100644
--- a/src/common/othello.ts
+++ b/src/common/othello.ts
@@ -38,49 +38,49 @@ export default class Othello extends EventEmitter {
 			switch (r[0]) {
 				case 0: // 上
 					for (let c = 0, _y = y - 1; c < r[1]; c++, _y--) {
-						this.board[x][_y] = color;
+						this.board[_y][x] = color;
 					}
 					break;
 
 				case 1: // 右上
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[x + i][y - i] = color;
+						this.board[y - i][x + i] = color;
 					}
 					break;
 
 				case 2: // 右
 					for (let c = 0, _x = x + 1; c < r[1]; c++, _x++) {
-						this.board[_x][y] = color;
+						this.board[y][_x] = color;
 					}
 					break;
 
 				case 3: // 右下
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[x + i][y + i] = color;
+						this.board[y + i][x + i] = color;
 					}
 					break;
 
 				case 4: // 下
 					for (let c = 0, _y = y + 1; c < r[1]; c++, _y++) {
-						this.board[x][_y] = color;
+						this.board[_y][x] = color;
 					}
 					break;
 
 				case 5: // 左下
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[x - i][y + i] = color;
+						this.board[y + i][x - i] = color;
 					}
 					break;
 
 				case 6: // 左
 					for (let c = 0, _x = x - 1; c < r[1]; c++, _x--) {
-						this.board[_x][y] = color;
+						this.board[y][_x] = color;
 					}
 					break;
 
 				case 7: // 左上
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[x - i][y - i] = color;
+						this.board[y - i][x - i] = color;
 					}
 					break;
 				}
@@ -117,11 +117,11 @@ export default class Othello extends EventEmitter {
 			return (x, y): any => {
 				if (breaked) {
 					return;
-				} else if (this.board[x][y] == myColor && opponentStoneFound) {
+				} else if (this.board[y][x] == myColor && opponentStoneFound) {
 					return true;
-				} else if (this.board[x][y] == myColor && !opponentStoneFound) {
+				} else if (this.board[y][x] == myColor && !opponentStoneFound) {
 					breaked = true;
-				} else if (this.board[x][y] == opponentColor) {
+				} else if (this.board[y][x] == opponentColor) {
 					opponentStoneFound = true;
 				} else {
 					breaked = true;
@@ -209,16 +209,19 @@ export default class Othello extends EventEmitter {
 	}
 
 	public toString(): string {
+		//return this.board.map(row => row.map(state => state === 'black' ? '●' : state === 'white' ? '○' : '┼').join('')).join('\n');
 		return this.board.map(row => row.map(state => state === 'black' ? '⚫️' : state === 'white' ? '⚪️' : '🔹').join('')).join('\n');
 	}
 
 	public toPatternString(color): string {
+		//const num = ['０', '１', '２', '３', '４', '５', '６', '７', '８', '９'];
 		const num = ['0️⃣', '1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣', '6️⃣', '7️⃣', '8️⃣', '9️⃣', '🔟'];
 
 		const pattern = this.getPattern(color);
 
 		return this.board.map((row, y) => row.map((state, x) => {
 			const i = pattern.findIndex(p => p[0] == x && p[1] == y);
+			//return state === 'black' ? '●' : state === 'white' ? '○' : i != -1 ? num[i] : '┼';
 			return state === 'black' ? '⚫️' : state === 'white' ? '⚪️' : i != -1 ? num[i] : '🔹';
 		}).join('')).join('\n');
 	}
-- 
cgit v1.2.3-freya


From e05144b93ee671e03739640868d32a4d31b91b35 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 8 Oct 2017 04:13:38 +0900
Subject: :v:

---
 src/api/bot/core.ts   | 9 ++++++++-
 src/common/othello.ts | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/api/bot/core.ts b/src/api/bot/core.ts
index ca5f5b89eb..207de71619 100644
--- a/src/api/bot/core.ts
+++ b/src/api/bot/core.ts
@@ -287,8 +287,15 @@ class OthelloContext extends Context {
 
 	public async q(query: string): Promise<string> {
 		this.othello.setByNumber('black', parseInt(query, 10));
+		const s = this.othello.toString() + '\n\n...(AI)...\n\n';
 		othelloAi('white', this.othello);
-		return this.othello.toPatternString('black');
+		if (this.othello.getPattern('black').length === 0) {
+			this.bot.clearContext();
+			return '～終了～';
+		} else {
+			this.emit('updated');
+			return s + this.othello.toPatternString('black');
+		}
 	}
 
 	public export() {
diff --git a/src/common/othello.ts b/src/common/othello.ts
index ef11514dff..0b377ff5d3 100644
--- a/src/common/othello.ts
+++ b/src/common/othello.ts
@@ -275,4 +275,6 @@ export function ai(color: string, othello: Othello) {
 			}
 		}
 	}
+
+	think();
 }
-- 
cgit v1.2.3-freya


From 06a4cb93dfb6bd8d610949fb574be24915f88117 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 9 Oct 2017 00:23:17 +0900
Subject: Refactor

---
 src/common/othello.ts | 63 ++++++++++++---------------------------------------
 1 file changed, 14 insertions(+), 49 deletions(-)

(limited to 'src/common')

diff --git a/src/common/othello.ts b/src/common/othello.ts
index 0b377ff5d3..5f7000019a 100644
--- a/src/common/othello.ts
+++ b/src/common/othello.ts
@@ -1,14 +1,10 @@
-import * as EventEmitter from 'events';
-
-export default class Othello extends EventEmitter {
+export default class Othello {
 	public board: Array<Array<'black' | 'white'>>;
 
 	/**
 	 * ゲームを初期化します
 	 */
 	constructor() {
-		super();
-
 		this.board = [
 			[null, null, null, null, null, null, null, null],
 			[null, null, null, null, null, null, null, null],
@@ -26,11 +22,15 @@ export default class Othello extends EventEmitter {
 		this.set(color, ps[n][0], ps[n][1]);
 	}
 
+	private write(color, x, y) {
+		this.board[y][x] = color;
+	}
+
 	/**
 	 * 石を配置します
 	 */
 	public set(color, x, y) {
-		this.board[y][x] = color;
+		this.write(color, x, y);
 
 		const reverses = this.getReverse(color, x, y);
 
@@ -38,55 +38,53 @@ export default class Othello extends EventEmitter {
 			switch (r[0]) {
 				case 0: // 上
 					for (let c = 0, _y = y - 1; c < r[1]; c++, _y--) {
-						this.board[_y][x] = color;
+						this.write(color, x, _y);
 					}
 					break;
 
 				case 1: // 右上
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[y - i][x + i] = color;
+						this.write(color, x + i, y - i);
 					}
 					break;
 
 				case 2: // 右
 					for (let c = 0, _x = x + 1; c < r[1]; c++, _x++) {
-						this.board[y][_x] = color;
+						this.write(color, _x, y);
 					}
 					break;
 
 				case 3: // 右下
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[y + i][x + i] = color;
+						this.write(color, x + i, y + i);
 					}
 					break;
 
 				case 4: // 下
 					for (let c = 0, _y = y + 1; c < r[1]; c++, _y++) {
-						this.board[_y][x] = color;
+						this.write(color, x, _y);
 					}
 					break;
 
 				case 5: // 左下
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[y + i][x - i] = color;
+						this.write(color, x - i, y + i);
 					}
 					break;
 
 				case 6: // 左
 					for (let c = 0, _x = x - 1; c < r[1]; c++, _x--) {
-						this.board[y][_x] = color;
+						this.write(color, _x, y);
 					}
 					break;
 
 				case 7: // 左上
 					for (let c = 0, i = 1; c < r[1]; c++, i++) {
-						this.board[y - i][x - i] = color;
+						this.write(color, x - i, y - i);
 					}
 					break;
 				}
 		});
-
-		this.emit('set:' + color, x, y);
 	}
 
 	/**
@@ -226,40 +224,7 @@ export default class Othello extends EventEmitter {
 		}).join('')).join('\n');
 	}
 }
-/*
-export class Ai {
-	private othello: Othello;
-	private color: string;
-	private opponentColor: string;
-
-	constructor(color: string, othello: Othello) {
-		this.othello = othello;
-		this.color = color;
-		this.opponentColor = this.color == 'black' ? 'white' : 'black';
-
-		this.othello.on('set:' + this.opponentColor, () => {
-			this.turn();
-		});
 
-		if (this.color == 'black') {
-			this.turn();
-		}
-	}
-
-	public turn() {
-		const ps = this.othello.getPattern(this.color);
-		if (ps.length > 0) {
-			const p = ps[Math.floor(Math.random() * ps.length)];
-			this.othello.set(this.color, p[0], p[1]);
-
-			// 相手の打つ場所がない場合続けてAIのターン
-			if (this.othello.getPattern(this.opponentColor).length === 0) {
-				this.turn();
-			}
-		}
-	}
-}
-*/
 export function ai(color: string, othello: Othello) {
 	const opponentColor = color == 'black' ? 'white' : 'black';
 
-- 
cgit v1.2.3-freya


From 1316f17dca5ac024c91ba93d0522a073f2c546be Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 9 Oct 2017 00:43:53 +0900
Subject: Improve the othello AI

---
 src/common/othello.ts | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'src/common')

diff --git a/src/common/othello.ts b/src/common/othello.ts
index 5f7000019a..15dc571ced 100644
--- a/src/common/othello.ts
+++ b/src/common/othello.ts
@@ -229,10 +229,31 @@ export function ai(color: string, othello: Othello) {
 	const opponentColor = color == 'black' ? 'white' : 'black';
 
 	function think() {
+		// 打てる場所を取得
 		const ps = othello.getPattern(color);
-		if (ps.length > 0) {
-			const p = ps[Math.floor(Math.random() * ps.length)];
-			othello.set(color, p[0], p[1]);
+
+		if (ps.length > 0) { // 打てる場所がある場合
+			// 角を取得
+			const corners = ps.filter(p =>
+				// 左上
+				(p[0] == 0 && p[1] == 0) ||
+				// 右上
+				(p[0] == 7 && p[1] == 0) ||
+				// 右下
+				(p[0] == 7 && p[1] == 7) ||
+				// 左下
+				(p[0] == 0 && p[1] == 7)
+			);
+
+			if (corners.length > 0) { // どこかしらの角に打てる場合
+				// 打てる角からランダムに選択して打つ
+				const p = corners[Math.floor(Math.random() * corners.length)];
+				othello.set(color, p[0], p[1]);
+			} else { // 打てる角がない場合
+				// 打てる場所からランダムに選択して打つ
+				const p = ps[Math.floor(Math.random() * ps.length)];
+				othello.set(color, p[0], p[1]);
+			}
 
 			// 相手の打つ場所がない場合続けてAIのターン
 			if (othello.getPattern(opponentColor).length === 0) {
-- 
cgit v1.2.3-freya


From c8dbf5776e20229a68ad623f9f05edc578185329 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 9 Oct 2017 00:49:48 +0900
Subject: :v:

---
 src/common/othello.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/othello.ts b/src/common/othello.ts
index 15dc571ced..0f96d477ee 100644
--- a/src/common/othello.ts
+++ b/src/common/othello.ts
@@ -213,7 +213,7 @@ export default class Othello {
 
 	public toPatternString(color): string {
 		//const num = ['０', '１', '２', '３', '４', '５', '６', '７', '８', '９'];
-		const num = ['0️⃣', '1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣', '6️⃣', '7️⃣', '8️⃣', '9️⃣', '🔟'];
+		const num = ['0️⃣', '1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣', '6️⃣', '7️⃣', '8️⃣', '9️⃣', '🔟', '🍏', '🍎', '🍐', '🍊', '🍋', '🍌', '🍉', '🍇', '🍓', '🍈', '🍒', '🍑', '🍍'];
 
 		const pattern = this.getPattern(color);
 
-- 
cgit v1.2.3-freya


From b717e575eacfd446d1daedc4c3297b985a8f69d9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 9 Oct 2017 19:52:18 +0900
Subject: Refactor: Remove the magick numbers

---
 src/common/othello.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/common')

diff --git a/src/common/othello.ts b/src/common/othello.ts
index 0f96d477ee..aa53dee465 100644
--- a/src/common/othello.ts
+++ b/src/common/othello.ts
@@ -1,3 +1,5 @@
+const BOARD_SIZE = 8;
+
 export default class Othello {
 	public board: Array<Array<'black' | 'white'>>;
 
@@ -142,7 +144,7 @@ export default class Othello {
 
 		// 右上
 		iterate = createIterater();
-		for (let c = 0, i = 1; i < Math.min(8 - targetx, targety); c++, i++) {
+		for (let c = 0, i = 1; i < Math.min(BOARD_SIZE - targetx, targety); c++, i++) {
 			if (iterate(targetx + i, targety - i)) {
 				res.push([1, c]);
 				break;
@@ -151,7 +153,7 @@ export default class Othello {
 
 		// 右
 		iterate = createIterater();
-		for (let c = 0, x = targetx + 1; x < 8; c++, x++) {
+		for (let c = 0, x = targetx + 1; x < BOARD_SIZE; c++, x++) {
 			if (iterate(x, targety)) {
 				res.push([2, c]);
 				break;
@@ -160,7 +162,7 @@ export default class Othello {
 
 		// 右下
 		iterate = createIterater();
-		for (let c = 0, i = 1; i < Math.min(8 - targetx, 8 - targety); c++, i++) {
+		for (let c = 0, i = 1; i < Math.min(BOARD_SIZE - targetx, BOARD_SIZE - targety); c++, i++) {
 			if (iterate(targetx + i, targety + i)) {
 				res.push([3, c]);
 				break;
@@ -169,7 +171,7 @@ export default class Othello {
 
 		// 下
 		iterate = createIterater();
-		for (let c = 0, y = targety + 1; y < 8; c++, y++) {
+		for (let c = 0, y = targety + 1; y < BOARD_SIZE; c++, y++) {
 			if (iterate(targetx, y)) {
 				res.push([4, c]);
 				break;
@@ -178,7 +180,7 @@ export default class Othello {
 
 		// 左下
 		iterate = createIterater();
-		for (let c = 0, i = 1; i < Math.min(targetx, 8 - targety); c++, i++) {
+		for (let c = 0, i = 1; i < Math.min(targetx, BOARD_SIZE - targety); c++, i++) {
 			if (iterate(targetx - i, targety + i)) {
 				res.push([5, c]);
 				break;
@@ -238,11 +240,11 @@ export function ai(color: string, othello: Othello) {
 				// 左上
 				(p[0] == 0 && p[1] == 0) ||
 				// 右上
-				(p[0] == 7 && p[1] == 0) ||
+				(p[0] == (BOARD_SIZE - 1) && p[1] == 0) ||
 				// 右下
-				(p[0] == 7 && p[1] == 7) ||
+				(p[0] == (BOARD_SIZE - 1) && p[1] == (BOARD_SIZE - 1)) ||
 				// 左下
-				(p[0] == 0 && p[1] == 7)
+				(p[0] == 0 && p[1] == (BOARD_SIZE - 1))
 			);
 
 			if (corners.length > 0) { // どこかしらの角に打てる場合
-- 
cgit v1.2.3-freya


From e77b017edf487f3d88cda4f127c41579b65cb479 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 9 Oct 2017 20:12:06 +0900
Subject: Fix bug

---
 src/common/othello.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/othello.ts b/src/common/othello.ts
index aa53dee465..858fc33158 100644
--- a/src/common/othello.ts
+++ b/src/common/othello.ts
@@ -144,7 +144,7 @@ export default class Othello {
 
 		// 右上
 		iterate = createIterater();
-		for (let c = 0, i = 1; i < Math.min(BOARD_SIZE - targetx, targety); c++, i++) {
+		for (let c = 0, i = 1; i <= Math.min(BOARD_SIZE - targetx, targety); c++, i++) {
 			if (iterate(targetx + i, targety - i)) {
 				res.push([1, c]);
 				break;
@@ -198,7 +198,7 @@ export default class Othello {
 
 		// 左上
 		iterate = createIterater();
-		for (let c = 0, i = 1; i < Math.min(targetx, targety); c++, i++) {
+		for (let c = 0, i = 1; i <= Math.min(targetx, targety); c++, i++) {
 			if (iterate(targetx - i, targety - i)) {
 				res.push([7, c]);
 				break;
-- 
cgit v1.2.3-freya