summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-10-31 22:35:31 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-10-31 22:35:31 +0900
commit5efb52b9f563ae7d6b5383d054a6c21fee676b68 (patch)
tree96c4bf8ce8403e3a5dd75f10f7f3c1193cf2bbca /src
parentFix indent (diff)
downloadmisskey-5efb52b9f563ae7d6b5383d054a6c21fee676b68.tar.gz
misskey-5efb52b9f563ae7d6b5383d054a6c21fee676b68.tar.bz2
misskey-5efb52b9f563ae7d6b5383d054a6c21fee676b68.zip
wip
Diffstat (limited to 'src')
-rw-r--r--src/api/endpoints.ts12
-rw-r--r--src/api/endpoints/channels/create.ts (renamed from src/api/endpoints/bbs/threads/create.ts)4
-rw-r--r--src/web/app/desktop/router.js5
-rw-r--r--src/web/app/desktop/tags/pages/channels.tag8
-rw-r--r--src/web/app/desktop/tags/ui.tag8
5 files changed, 24 insertions, 13 deletions
diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
index 29a97bcb8a..26177b8775 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
index d9b4d34a0c..74b089dfc3 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 afa8a2dce3..51738f3afa 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 9e47e52d25..03fae3c8d1 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 452a72c00a..7527358dce 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">