summaryrefslogtreecommitdiff
path: root/src/client/app
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-17 08:10:54 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-17 08:10:54 +0900
commit1ef66c962a1cea81dee4f5db32cd011feac7de44 (patch)
tree006945b7ae9d437cebb0fabc5eb5a849cff518c5 /src/client/app
parentAdd missing semicolon (diff)
downloadsharkey-1ef66c962a1cea81dee4f5db32cd011feac7de44.tar.gz
sharkey-1ef66c962a1cea81dee4f5db32cd011feac7de44.tar.bz2
sharkey-1ef66c962a1cea81dee4f5db32cd011feac7de44.zip
reversi :white_flower: :100:
Diffstat (limited to 'src/client/app')
-rw-r--r--src/client/app/common/scripts/compose-notification.ts2
-rw-r--r--src/client/app/common/scripts/streaming/reversi-game.ts (renamed from src/client/app/common/scripts/streaming/othello-game.ts)4
-rw-r--r--src/client/app/common/scripts/streaming/reversi.ts (renamed from src/client/app/common/scripts/streaming/othello.ts)8
-rw-r--r--src/client/app/common/views/components/index.ts4
-rw-r--r--src/client/app/common/views/components/reversi.game.vue (renamed from src/client/app/common/views/components/othello.game.vue)14
-rw-r--r--src/client/app/common/views/components/reversi.gameroom.vue (renamed from src/client/app/common/views/components/othello.gameroom.vue)8
-rw-r--r--src/client/app/common/views/components/reversi.room.vue (renamed from src/client/app/common/views/components/othello.room.vue)2
-rw-r--r--src/client/app/common/views/components/reversi.vue (renamed from src/client/app/common/views/components/othello.vue)34
-rw-r--r--src/client/app/desktop/script.ts10
-rw-r--r--src/client/app/desktop/views/components/game-window.vue6
-rw-r--r--src/client/app/desktop/views/components/ui.header.nav.vue12
-rw-r--r--src/client/app/desktop/views/pages/reversi.vue (renamed from src/client/app/desktop/views/pages/othello.vue)6
-rw-r--r--src/client/app/mios.ts8
-rw-r--r--src/client/app/mobile/script.ts6
-rw-r--r--src/client/app/mobile/views/components/ui.header.vue12
-rw-r--r--src/client/app/mobile/views/components/ui.nav.vue14
-rw-r--r--src/client/app/mobile/views/pages/reversi.vue (renamed from src/client/app/mobile/views/pages/othello.vue)10
17 files changed, 80 insertions, 80 deletions
diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts
index c19b1c5ad0..cc28f75998 100644
--- a/src/client/app/common/scripts/compose-notification.ts
+++ b/src/client/app/common/scripts/compose-notification.ts
@@ -55,7 +55,7 @@ export default function(type, data): Notification {
icon: data.user.avatarUrl + '?thumbnail&size=64'
};
- case 'othello_invited':
+ case 'reversi_invited':
return {
title: '対局への招待があります',
body: `${getUserName(data.parent)}さんから`,
diff --git a/src/client/app/common/scripts/streaming/othello-game.ts b/src/client/app/common/scripts/streaming/reversi-game.ts
index 9e36f647bb..5638b3013f 100644
--- a/src/client/app/common/scripts/streaming/othello-game.ts
+++ b/src/client/app/common/scripts/streaming/reversi-game.ts
@@ -1,9 +1,9 @@
import Stream from './stream';
import MiOS from '../../../mios';
-export class OthelloGameStream extends Stream {
+export class ReversiGameStream extends Stream {
constructor(os: MiOS, me, game) {
- super(os, 'othello-game', {
+ super(os, 'reversi-game', {
i: me ? me.token : null,
game: game.id
});
diff --git a/src/client/app/common/scripts/streaming/othello.ts b/src/client/app/common/scripts/streaming/reversi.ts
index 8f4f217e39..2e4395f0f1 100644
--- a/src/client/app/common/scripts/streaming/othello.ts
+++ b/src/client/app/common/scripts/streaming/reversi.ts
@@ -2,15 +2,15 @@ import StreamManager from './stream-manager';
import Stream from './stream';
import MiOS from '../../../mios';
-export class OthelloStream extends Stream {
+export class ReversiStream extends Stream {
constructor(os: MiOS, me) {
- super(os, 'othello', {
+ super(os, 'reversi', {
i: me.token
});
}
}
-export class OthelloStreamManager extends StreamManager<OthelloStream> {
+export class ReversiStreamManager extends StreamManager<ReversiStream> {
private me;
private os: MiOS;
@@ -23,7 +23,7 @@ export class OthelloStreamManager extends StreamManager<OthelloStream> {
public getConnection() {
if (this.connection == null) {
- this.connection = new OthelloStream(this.os, this.me);
+ this.connection = new ReversiStream(this.os, this.me);
}
return this.connection;
diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts
index b91008f718..5b2fa084fb 100644
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -27,7 +27,7 @@ import urlPreview from './url-preview.vue';
import twitterSetting from './twitter-setting.vue';
import fileTypeIcon from './file-type-icon.vue';
import Switch from './switch.vue';
-import Othello from './othello.vue';
+import Reversi from './reversi.vue';
import welcomeTimeline from './welcome-timeline.vue';
import uiInput from './ui/input.vue';
import uiButton from './ui/button.vue';
@@ -65,7 +65,7 @@ Vue.component('mk-url-preview', urlPreview);
Vue.component('mk-twitter-setting', twitterSetting);
Vue.component('mk-file-type-icon', fileTypeIcon);
Vue.component('mk-switch', Switch);
-Vue.component('mk-othello', Othello);
+Vue.component('mk-reversi', Reversi);
Vue.component('mk-welcome-timeline', welcomeTimeline);
Vue.component('ui-input', uiInput);
Vue.component('ui-button', uiButton);
diff --git a/src/client/app/common/views/components/othello.game.vue b/src/client/app/common/views/components/reversi.game.vue
index 4c63bd18b8..dc79c95bb8 100644
--- a/src/client/app/common/views/components/othello.game.vue
+++ b/src/client/app/common/views/components/reversi.game.vue
@@ -43,7 +43,7 @@
<script lang="ts">
import Vue from 'vue';
import * as CRC32 from 'crc-32';
-import Othello, { Color } from '../../../../../othello/core';
+import Reversi, { Color } from '../../../../../reversi/core';
import { url } from '../../../config';
export default Vue.extend({
@@ -52,7 +52,7 @@ export default Vue.extend({
data() {
return {
game: null,
- o: null as Othello,
+ o: null as Reversi,
logs: [],
logPos: 0,
pollingClock: null
@@ -98,7 +98,7 @@ export default Vue.extend({
watch: {
logPos(v) {
if (!this.game.isEnded) return;
- this.o = new Othello(this.game.settings.map, {
+ this.o = new Reversi(this.game.settings.map, {
isLlotheo: this.game.settings.isLlotheo,
canPutEverywhere: this.game.settings.canPutEverywhere,
loopedBoard: this.game.settings.loopedBoard
@@ -115,7 +115,7 @@ export default Vue.extend({
created() {
this.game = this.initGame;
- this.o = new Othello(this.game.settings.map, {
+ this.o = new Reversi(this.game.settings.map, {
isLlotheo: this.game.settings.isLlotheo,
canPutEverywhere: this.game.settings.canPutEverywhere,
loopedBoard: this.game.settings.loopedBoard
@@ -163,7 +163,7 @@ export default Vue.extend({
// サウンドを再生する
if (this.$store.state.device.enableSounds) {
- const sound = new Audio(`${url}/assets/othello-put-me.mp3`);
+ const sound = new Audio(`${url}/assets/reversi-put-me.mp3`);
sound.volume = this.$store.state.device.soundVolume;
sound.play();
}
@@ -187,7 +187,7 @@ export default Vue.extend({
// サウンドを再生する
if (this.$store.state.device.enableSounds && x.color != this.myColor) {
- const sound = new Audio(`${url}/assets/othello-put-you.mp3`);
+ const sound = new Audio(`${url}/assets/reversi-put-you.mp3`);
sound.volume = this.$store.state.device.soundVolume;
sound.play();
}
@@ -213,7 +213,7 @@ export default Vue.extend({
onRescue(game) {
this.game = game;
- this.o = new Othello(this.game.settings.map, {
+ this.o = new Reversi(this.game.settings.map, {
isLlotheo: this.game.settings.isLlotheo,
canPutEverywhere: this.game.settings.canPutEverywhere,
loopedBoard: this.game.settings.loopedBoard
diff --git a/src/client/app/common/views/components/othello.gameroom.vue b/src/client/app/common/views/components/reversi.gameroom.vue
index 2dbd04ce49..7ce0112451 100644
--- a/src/client/app/common/views/components/othello.gameroom.vue
+++ b/src/client/app/common/views/components/reversi.gameroom.vue
@@ -7,9 +7,9 @@
<script lang="ts">
import Vue from 'vue';
-import XGame from './othello.game.vue';
-import XRoom from './othello.room.vue';
-import { OthelloGameStream } from '../../scripts/streaming/othello-game';
+import XGame from './reversi.game.vue';
+import XRoom from './reversi.room.vue';
+import { ReversiGameStream } from '../../scripts/streaming/reversi-game';
export default Vue.extend({
components: {
@@ -25,7 +25,7 @@ export default Vue.extend({
},
created() {
this.g = this.game;
- this.connection = new OthelloGameStream((this as any).os, this.$store.state.i, this.game);
+ this.connection = new ReversiGameStream((this as any).os, this.$store.state.i, this.game);
this.connection.on('started', this.onStarted);
},
beforeDestroy() {
diff --git a/src/client/app/common/views/components/othello.room.vue b/src/client/app/common/views/components/reversi.room.vue
index dcf41f2e04..5074845758 100644
--- a/src/client/app/common/views/components/othello.room.vue
+++ b/src/client/app/common/views/components/reversi.room.vue
@@ -94,7 +94,7 @@
<script lang="ts">
import Vue from 'vue';
-import * as maps from '../../../../../othello/maps';
+import * as maps from '../../../../../reversi/maps';
export default Vue.extend({
props: ['game', 'connection'],
diff --git a/src/client/app/common/views/components/othello.vue b/src/client/app/common/views/components/reversi.vue
index a0971c45b4..e4d7740bde 100644
--- a/src/client/app/common/views/components/othello.vue
+++ b/src/client/app/common/views/components/reversi.vue
@@ -1,5 +1,5 @@
<template>
-<div class="mk-othello">
+<div class="mk-reversi">
<div v-if="game">
<x-gameroom :game="game"/>
</div>
@@ -11,14 +11,14 @@
</div>
<div class="index" v-else>
<h1>Misskey %fa:circle%thell%fa:circle R%</h1>
- <p>他のMisskeyユーザーとオセロで対戦しよう</p>
+ <p>他のMisskeyユーザーとリバーシで対戦しよう</p>
<div class="play">
<el-button round>フリーマッチ(準備中)</el-button>
<el-button type="primary" round @click="match">指名</el-button>
<details>
<summary>遊び方</summary>
<div>
- <p>オセロは、相手と交互に石をボードに置いてゆき、相手の石を挟んでひっくり返しながら、最終的に残った石が多い方が勝ちというボードゲームです。</p>
+ <p>リバーシは、相手と交互に石をボードに置いてゆき、相手の石を挟んでひっくり返しながら、最終的に残った石が多い方が勝ちというボードゲームです。</p>
<dl>
<dt><b>フリーマッチ</b></dt>
<dd>ランダムなユーザーと対戦するモードです。</dd>
@@ -39,7 +39,7 @@
</section>
<section v-if="myGames.length > 0">
<h2>自分の対局</h2>
- <a class="game" v-for="g in myGames" tabindex="-1" @click.prevent="go(g)" :href="`/othello/${g.id}`">
+ <a class="game" v-for="g in myGames" tabindex="-1" @click.prevent="go(g)" :href="`/reversi/${g.id}`">
<mk-avatar class="avatar" :user="g.user1"/>
<mk-avatar class="avatar" :user="g.user2"/>
<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
@@ -48,7 +48,7 @@
</section>
<section v-if="games.length > 0">
<h2>みんなの対局</h2>
- <a class="game" v-for="g in games" tabindex="-1" @click.prevent="go(g)" :href="`/othello/${g.id}`">
+ <a class="game" v-for="g in games" tabindex="-1" @click.prevent="go(g)" :href="`/reversi/${g.id}`">
<mk-avatar class="avatar" :user="g.user1"/>
<mk-avatar class="avatar" :user="g.user2"/>
<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
@@ -61,7 +61,7 @@
<script lang="ts">
import Vue from 'vue';
-import XGameroom from './othello.gameroom.vue';
+import XGameroom from './reversi.gameroom.vue';
export default Vue.extend({
components: {
@@ -93,24 +93,24 @@ export default Vue.extend({
}
},
mounted() {
- this.connection = (this as any).os.streams.othelloStream.getConnection();
- this.connectionId = (this as any).os.streams.othelloStream.use();
+ this.connection = (this as any).os.streams.reversiStream.getConnection();
+ this.connectionId = (this as any).os.streams.reversiStream.use();
this.connection.on('matched', this.onMatched);
this.connection.on('invited', this.onInvited);
- (this as any).api('othello/games', {
+ (this as any).api('reversi/games', {
my: true
}).then(games => {
this.myGames = games;
});
- (this as any).api('othello/games').then(games => {
+ (this as any).api('reversi/games').then(games => {
this.games = games;
this.gamesFetching = false;
});
- (this as any).api('othello/invitations').then(invitations => {
+ (this as any).api('reversi/invitations').then(invitations => {
this.invitations = this.invitations.concat(invitations);
});
@@ -126,13 +126,13 @@ export default Vue.extend({
beforeDestroy() {
this.connection.off('matched', this.onMatched);
this.connection.off('invited', this.onInvited);
- (this as any).os.streams.othelloStream.dispose(this.connectionId);
+ (this as any).os.streams.reversiStream.dispose(this.connectionId);
clearInterval(this.pingClock);
},
methods: {
go(game) {
- (this as any).api('othello/games/show', {
+ (this as any).api('reversi/games/show', {
gameId: game.id
}).then(game => {
this.matching = null;
@@ -146,7 +146,7 @@ export default Vue.extend({
(this as any).api('users/show', {
username
}).then(user => {
- (this as any).api('othello/match', {
+ (this as any).api('reversi/match', {
userId: user.id
}).then(res => {
if (res == null) {
@@ -160,10 +160,10 @@ export default Vue.extend({
},
cancel() {
this.matching = null;
- (this as any).api('othello/match/cancel');
+ (this as any).api('reversi/match/cancel');
},
accept(invitation) {
- (this as any).api('othello/match', {
+ (this as any).api('reversi/match', {
userId: invitation.parent.id
}).then(game => {
if (game) {
@@ -186,7 +186,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
@import '~const.styl'
-.mk-othello
+.mk-reversi
color #677f84
background #fff
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 076d532d6d..201ab0a83d 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -34,7 +34,7 @@ import MkMessagingRoom from './views/pages/messaging-room.vue';
import MkNote from './views/pages/note.vue';
import MkSearch from './views/pages/search.vue';
import MkTag from './views/pages/tag.vue';
-import MkOthello from './views/pages/othello.vue';
+import MkReversi from './views/pages/reversi.vue';
import MkShare from './views/pages/share.vue';
/**
@@ -64,8 +64,8 @@ init(async (launch) => {
{ path: '/search', component: MkSearch },
{ path: '/tags/:tag', component: MkTag },
{ path: '/share', component: MkShare },
- { path: '/othello', component: MkOthello },
- { path: '/othello/:game', component: MkOthello },
+ { path: '/reversi', component: MkReversi },
+ { path: '/reversi/:game', component: MkReversi },
{ path: '/@:user', component: MkUser },
{ path: '/notes/:note', component: MkNote }
]
@@ -166,8 +166,8 @@ function registerNotifications(stream: HomeStreamManager) {
setTimeout(n.close.bind(n), 7000);
});
- connection.on('othello_invited', matching => {
- const _n = composeNotification('othello_invited', matching);
+ connection.on('reversi_invited', matching => {
+ const _n = composeNotification('reversi_invited', matching);
const n = new Notification(_n.title, {
body: _n.body,
icon: _n.icon
diff --git a/src/client/app/desktop/views/components/game-window.vue b/src/client/app/desktop/views/components/game-window.vue
index c3c0f90075..7c6cb9cd40 100644
--- a/src/client/app/desktop/views/components/game-window.vue
+++ b/src/client/app/desktop/views/components/game-window.vue
@@ -1,7 +1,7 @@
<template>
<mk-window ref="window" width="500px" height="560px" :popout-url="popout" @closed="$destroy">
<span slot="header" :class="$style.header">%fa:gamepad%%i18n:@game%</span>
- <mk-othello :class="$style.content" @gamed="g => game = g"/>
+ <mk-reversi :class="$style.content" @gamed="g => game = g"/>
</mk-window>
</template>
@@ -18,8 +18,8 @@ export default Vue.extend({
computed: {
popout(): string {
return this.game
- ? `${url}/othello/${this.game.id}`
- : `${url}/othello`;
+ ? `${url}/reversi/${this.game.id}`
+ : `${url}/reversi`;
}
}
});
diff --git a/src/client/app/desktop/views/components/ui.header.nav.vue b/src/client/app/desktop/views/components/ui.header.nav.vue
index fe2637cec3..42211b57fe 100644
--- a/src/client/app/desktop/views/components/ui.header.nav.vue
+++ b/src/client/app/desktop/views/components/ui.header.nav.vue
@@ -56,23 +56,23 @@ export default Vue.extend({
this.connection = (this as any).os.stream.getConnection();
this.connectionId = (this as any).os.stream.use();
- this.connection.on('othello_invited', this.onOthelloInvited);
- this.connection.on('othello_no_invites', this.onOthelloNoInvites);
+ this.connection.on('reversi_invited', this.onReversiInvited);
+ this.connection.on('reversi_no_invites', this.onReversiNoInvites);
}
},
beforeDestroy() {
if (this.$store.getters.isSignedIn) {
- this.connection.off('othello_invited', this.onOthelloInvited);
- this.connection.off('othello_no_invites', this.onOthelloNoInvites);
+ this.connection.off('reversi_invited', this.onReversiInvited);
+ this.connection.off('reversi_no_invites', this.onReversiNoInvites);
(this as any).os.stream.dispose(this.connectionId);
}
},
methods: {
- onOthelloInvited() {
+ onReversiInvited() {
this.hasGameInvitations = true;
},
- onOthelloNoInvites() {
+ onReversiNoInvites() {
this.hasGameInvitations = false;
},
diff --git a/src/client/app/desktop/views/pages/othello.vue b/src/client/app/desktop/views/pages/reversi.vue
index 0d8e987dd9..098fc41f1c 100644
--- a/src/client/app/desktop/views/pages/othello.vue
+++ b/src/client/app/desktop/views/pages/reversi.vue
@@ -1,6 +1,6 @@
<template>
<component :is="ui ? 'mk-ui' : 'div'">
- <mk-othello v-if="!fetching" :init-game="game" @gamed="onGamed"/>
+ <mk-reversi v-if="!fetching" :init-game="game" @gamed="onGamed"/>
</component>
</template>
@@ -33,7 +33,7 @@ export default Vue.extend({
Progress.start();
this.fetching = true;
- (this as any).api('othello/games/show', {
+ (this as any).api('reversi/games/show', {
gameId: this.$route.params.game
}).then(game => {
this.game = game;
@@ -43,7 +43,7 @@ export default Vue.extend({
});
},
onGamed(game) {
- history.pushState(null, null, '/othello/' + game.id);
+ history.pushState(null, null, '/reversi/' + game.id);
}
}
});
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index ba3f967a23..9a8d19adbd 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -11,7 +11,7 @@ import { DriveStreamManager } from './common/scripts/streaming/drive';
import { ServerStatsStreamManager } from './common/scripts/streaming/server-stats';
import { NotesStatsStreamManager } from './common/scripts/streaming/notes-stats';
import { MessagingIndexStreamManager } from './common/scripts/streaming/messaging-index';
-import { OthelloStreamManager } from './common/scripts/streaming/othello';
+import { ReversiStreamManager } from './common/scripts/streaming/reversi';
import Err from './common/views/components/connect-failed.vue';
import { LocalTimelineStreamManager } from './common/scripts/streaming/local-timeline';
@@ -108,7 +108,7 @@ export default class MiOS extends EventEmitter {
serverStatsStream: ServerStatsStreamManager;
notesStatsStream: NotesStatsStreamManager;
messagingIndexStream: MessagingIndexStreamManager;
- othelloStream: OthelloStreamManager;
+ reversiStream: ReversiStreamManager;
} = {
localTimelineStream: null,
globalTimelineStream: null,
@@ -116,7 +116,7 @@ export default class MiOS extends EventEmitter {
serverStatsStream: null,
notesStatsStream: null,
messagingIndexStream: null,
- othelloStream: null
+ reversiStream: null
};
/**
@@ -233,7 +233,7 @@ export default class MiOS extends EventEmitter {
this.streams.globalTimelineStream = new GlobalTimelineStreamManager(this, this.store.state.i);
this.streams.driveStream = new DriveStreamManager(this, this.store.state.i);
this.streams.messagingIndexStream = new MessagingIndexStreamManager(this, this.store.state.i);
- this.streams.othelloStream = new OthelloStreamManager(this, this.store.state.i);
+ this.streams.reversiStream = new ReversiStreamManager(this, this.store.state.i);
});
//#endregion
diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts
index 1572fd73ed..cc0a8331ba 100644
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -35,7 +35,7 @@ import MkFavorites from './views/pages/favorites.vue';
import MkUserLists from './views/pages/user-lists.vue';
import MkUserList from './views/pages/user-list.vue';
import MkSettings from './views/pages/settings.vue';
-import MkOthello from './views/pages/othello.vue';
+import MkReversi from './views/pages/reversi.vue';
import MkTag from './views/pages/tag.vue';
import MkShare from './views/pages/share.vue';
@@ -75,8 +75,8 @@ init((launch) => {
{ path: '/search', component: MkSearch },
{ path: '/tags/:tag', component: MkTag },
{ path: '/share', component: MkShare },
- { path: '/othello', name: 'othello', component: MkOthello },
- { path: '/othello/:game', component: MkOthello },
+ { path: '/reversi', name: 'reversi', component: MkReversi },
+ { path: '/reversi/:game', component: MkReversi },
{ path: '/@:user', component: MkUser },
{ path: '/@:user/followers', component: MkFollowers },
{ path: '/@:user/following', component: MkFollowing },
diff --git a/src/client/app/mobile/views/components/ui.header.vue b/src/client/app/mobile/views/components/ui.header.vue
index c72b15fb8b..c1ee70d105 100644
--- a/src/client/app/mobile/views/components/ui.header.vue
+++ b/src/client/app/mobile/views/components/ui.header.vue
@@ -45,8 +45,8 @@ export default Vue.extend({
this.connection = (this as any).os.stream.getConnection();
this.connectionId = (this as any).os.stream.use();
- this.connection.on('othello_invited', this.onOthelloInvited);
- this.connection.on('othello_no_invites', this.onOthelloNoInvites);
+ this.connection.on('reversi_invited', this.onReversiInvited);
+ this.connection.on('reversi_no_invites', this.onReversiNoInvites);
const ago = (new Date().getTime() - new Date(this.$store.state.i.lastUsedAt).getTime()) / 1000;
const isHisasiburi = ago >= 3600;
@@ -98,16 +98,16 @@ export default Vue.extend({
},
beforeDestroy() {
if (this.$store.getters.isSignedIn) {
- this.connection.off('othello_invited', this.onOthelloInvited);
- this.connection.off('othello_no_invites', this.onOthelloNoInvites);
+ this.connection.off('reversi_invited', this.onReversiInvited);
+ this.connection.off('reversi_no_invites', this.onReversiNoInvites);
(this as any).os.stream.dispose(this.connectionId);
}
},
methods: {
- onOthelloInvited() {
+ onReversiInvited() {
this.hasGameInvitation = true;
},
- onOthelloNoInvites() {
+ onReversiNoInvites() {
this.hasGameInvitation = false;
}
}
diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue
index 80f60e4232..bb7a2f558c 100644
--- a/src/client/app/mobile/views/components/ui.nav.vue
+++ b/src/client/app/mobile/views/components/ui.nav.vue
@@ -19,7 +19,7 @@
<li><router-link to="/i/notifications" :data-active="$route.name == 'notifications'">%fa:R bell%%i18n:@notifications%<template v-if="hasUnreadNotification">%fa:circle%</template>%fa:angle-right%</router-link></li>
<li><router-link to="/i/messaging" :data-active="$route.name == 'messaging'">%fa:R comments%%i18n:@messaging%<template v-if="hasUnreadMessagingMessage">%fa:circle%</template>%fa:angle-right%</router-link></li>
<li v-if="$store.getters.isSignedIn && $store.state.i.isLocked"><router-link to="/i/received-follow-requests" :data-active="$route.name == 'received-follow-requests'">%fa:R envelope%%i18n:@follow-requests%<template v-if="$store.getters.isSignedIn && $store.state.i.pendingReceivedFollowRequestsCount">%fa:circle%</template>%fa:angle-right%</router-link></li>
- <li><router-link to="/othello" :data-active="$route.name == 'othello'">%fa:gamepad%%i18n:@game%<template v-if="hasGameInvitation">%fa:circle%</template>%fa:angle-right%</router-link></li>
+ <li><router-link to="/reversi" :data-active="$route.name == 'reversi'">%fa:gamepad%%i18n:@game%<template v-if="hasGameInvitation">%fa:circle%</template>%fa:angle-right%</router-link></li>
</ul>
<ul>
<li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'">%fa:R calendar-alt%%i18n:@widgets%%fa:angle-right%</router-link></li>
@@ -66,14 +66,14 @@ export default Vue.extend({
this.connection = (this as any).os.stream.getConnection();
this.connectionId = (this as any).os.stream.use();
- this.connection.on('othello_invited', this.onOthelloInvited);
- this.connection.on('othello_no_invites', this.onOthelloNoInvites);
+ this.connection.on('reversi_invited', this.onReversiInvited);
+ this.connection.on('reversi_no_invites', this.onReversiNoInvites);
}
},
beforeDestroy() {
if (this.$store.getters.isSignedIn) {
- this.connection.off('othello_invited', this.onOthelloInvited);
- this.connection.off('othello_no_invites', this.onOthelloNoInvites);
+ this.connection.off('reversi_invited', this.onReversiInvited);
+ this.connection.off('reversi_no_invites', this.onReversiNoInvites);
(this as any).os.stream.dispose(this.connectionId);
}
},
@@ -83,10 +83,10 @@ export default Vue.extend({
if (query == null || query == '') return;
this.$router.push('/search?q=' + encodeURIComponent(query));
},
- onOthelloInvited() {
+ onReversiInvited() {
this.hasGameInvitation = true;
},
- onOthelloNoInvites() {
+ onReversiNoInvites() {
this.hasGameInvitation = false;
},
dark() {
diff --git a/src/client/app/mobile/views/pages/othello.vue b/src/client/app/mobile/views/pages/reversi.vue
index e04e583c20..e2f0db6d87 100644
--- a/src/client/app/mobile/views/pages/othello.vue
+++ b/src/client/app/mobile/views/pages/reversi.vue
@@ -1,7 +1,7 @@
<template>
<mk-ui>
- <span slot="header">%fa:gamepad%オセロ</span>
- <mk-othello v-if="!fetching" :init-game="game" @gamed="onGamed"/>
+ <span slot="header">%fa:gamepad%リバーシ</span>
+ <mk-reversi v-if="!fetching" :init-game="game" @gamed="onGamed"/>
</mk-ui>
</template>
@@ -23,7 +23,7 @@ export default Vue.extend({
this.fetch();
},
mounted() {
- document.title = 'Misskey オセロ';
+ document.title = 'Misskey リバーシ';
document.documentElement.style.background = '#fff';
},
methods: {
@@ -33,7 +33,7 @@ export default Vue.extend({
Progress.start();
this.fetching = true;
- (this as any).api('othello/games/show', {
+ (this as any).api('reversi/games/show', {
gameId: this.$route.params.game
}).then(game => {
this.game = game;
@@ -43,7 +43,7 @@ export default Vue.extend({
});
},
onGamed(game) {
- history.pushState(null, null, '/othello/' + game.id);
+ history.pushState(null, null, '/reversi/' + game.id);
}
}
});