From 5efb52b9f563ae7d6b5383d054a6c21fee676b68 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 31 Oct 2017 22:35:31 +0900
Subject: [PATCH] wip

---
 locales/en.yml                                       |  2 +-
 locales/ja.yml                                       |  2 +-
 src/api/endpoints.ts                                 | 12 ++++++++++--
 .../endpoints/{bbs/threads => channels}/create.ts    |  4 ++--
 src/web/app/desktop/router.js                        |  5 +++++
 src/web/app/desktop/tags/pages/channels.tag          |  8 +++-----
 src/web/app/desktop/tags/ui.tag                      |  8 ++++----
 7 files changed, 26 insertions(+), 15 deletions(-)
 rename src/api/endpoints/{bbs/threads => channels}/create.ts (84%)

diff --git a/locales/en.yml b/locales/en.yml
index da532fc78..5c7a1165b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -241,7 +241,7 @@ desktop:
     mk-ui-header-nav:
       home: "Home"
       messaging: "Messages"
-      bbs: "BBS"
+      channels: "Channels"
       info: "News"
 
     mk-ui-header-search:
diff --git a/locales/ja.yml b/locales/ja.yml
index 1ae94652b..dd76a2b90 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -241,7 +241,7 @@ desktop:
     mk-ui-header-nav:
       home: "ホーム"
       messaging: "メッセージ"
-      bbs: "掲示板"
+      channels: "チャンネル"
       info: "お知らせ"
 
     mk-ui-header-search:
diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
index 29a97bcb8..26177b877 100644
--- a/src/api/endpoints.ts
+++ b/src/api/endpoints.ts
@@ -474,8 +474,16 @@ const endpoints: Endpoint[] = [
 		name: 'messaging/messages/create',
 		withCredential: true,
 		kind: 'messaging-write'
-	}
-
+	},
+	{
+		name: 'channels/create',
+		withCredential: true,
+		limit: {
+			duration: ms('1hour'),
+			max: 3,
+			minInterval: ms('10seconds')
+		}
+	},
 ];
 
 export default endpoints;
diff --git a/src/api/endpoints/bbs/threads/create.ts b/src/api/endpoints/channels/create.ts
similarity index 84%
rename from src/api/endpoints/bbs/threads/create.ts
rename to src/api/endpoints/channels/create.ts
index d9b4d34a0..74b089dfc 100644
--- a/src/api/endpoints/bbs/threads/create.ts
+++ b/src/api/endpoints/channels/create.ts
@@ -2,8 +2,8 @@
  * Module dependencies
  */
 import $ from 'cafy';
-import Channel from '../../../models/channel';
-import serialize from '../../../serializers/channel';
+import Channel from '../../models/channel';
+import serialize from '../../serializers/channel';
 
 /**
  * Create a channel
diff --git a/src/web/app/desktop/router.js b/src/web/app/desktop/router.js
index afa8a2dce..51738f3af 100644
--- a/src/web/app/desktop/router.js
+++ b/src/web/app/desktop/router.js
@@ -9,6 +9,7 @@ let page = null;
 export default me => {
 	route('/',              index);
 	route('/i>mentions',    mentions);
+	route('/channel',       channels);
 	route('/post::post',    post);
 	route('/search::query', search);
 	route('/:user',         user.bind(null, 'home'));
@@ -54,6 +55,10 @@ export default me => {
 		mount(el);
 	}
 
+	function channels() {
+		mount(document.createElement('mk-channels-page'));
+	}
+
 	function notFound() {
 		mount(document.createElement('mk-not-found'));
 	}
diff --git a/src/web/app/desktop/tags/pages/channels.tag b/src/web/app/desktop/tags/pages/channels.tag
index 9e47e52d2..03fae3c8d 100644
--- a/src/web/app/desktop/tags/pages/channels.tag
+++ b/src/web/app/desktop/tags/pages/channels.tag
@@ -1,8 +1,7 @@
 <mk-channels-page>
 	<mk-ui ref="ui">
 		<main>
-			<h1>%i18n:desktop.tags.mk-bbs-page.title%</h1>
-			<button onclick={ parent.new }>%i18n:desktop.tags.mk-bbs-page.new%</button>
+			<button onclick={ parent.new }>%i18n:desktop.tags.mk-channels-page.new%</button>
 		</main>
 	</mk-ui>
 	<style>
@@ -14,16 +13,15 @@
 		this.mixin('api');
 
 		this.on('mount', () => {
-			document.title = '%i18n:desktop.tags.mk-bbs-page.title%';
 		});
 
 		this.new = () => {
-			const title = window.prompt('%i18n:desktop.tags.mk-bbs-page.channel-title%');
+			const title = window.prompt('%i18n:desktop.tags.mk-channels-page.channel-title%');
 
 			this.api('bbs/channels/create', {
 				title: title
 			}).then(channel => {
-				location.href = '/bbs/' + channel.id;
+				location.href = '/channel/' + channel.id;
 			});
 		};
 	</script>
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 452a72c00..7527358dc 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -335,10 +335,10 @@
 				</a>
 			</li>
 		</virtual>
-		<li class="bbs">
-			<a href={ CONFIG.url + '/bbs' }>
-				<i class="fa fa-coffee"></i>
-				<p>%i18n:desktop.tags.mk-ui-header-nav.bbs%</p>
+		<li class="channels">
+			<a href={ CONFIG.url + '/channel' }>
+				<i class="fa fa-television"></i>
+				<p>%i18n:desktop.tags.mk-ui-header-nav.channels%</p>
 			</a>
 		</li>
 		<li class="info">