Merge branch 'master' of https://github.com/syuilo/misskey

New Crowdin translations

locales/ca.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/de.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/en.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "I prefer sushi rather than pudding"
   show-reversi-board-labels: "Show row and column labels in Reversi"
   verified-user: "Verified user"
+  disable-animated-mfm: "Disable animated texts in a post"
   reversi:
     drawn: "Draw"
     my-turn: "Your turn"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Waiting for {}"
     cancel: "Cancel"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "Surrender"
+  surrendered: "By surrender"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "Play reversi with your friends!"

locales/es.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "Prefiero sushi a pudín"
   show-reversi-board-labels: "Mostrar etiquetas de filas y columnas en Reversi"
   verified-user: "Usuario verificado"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "Empatado"
     my-turn: "Mi turno"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Esperando por {}"
     cancel: "Cancelar"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/fr.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "Je préfère les sushis (au pudding)"
   show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
   verified-user: "Utilisateur·trice vérifié·e"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "Partie nulle"
     my-turn: "C’est votre tour"
@@ -156,7 +157,7 @@ auth/views/form.vue:
   accept: "Autoriser l’accès"
 auth/views/index.vue:
   loading: "Chargement en cours"
-  denied: "アプリケーションの連携をキャンセルしました。"
+  denied: "L'autorisation de l'application a été refusée."
   denied-paragraph: "Cette application ne va pas accéder à votre compte."
   already-authorized: "Cette application est déjà autorisée"
   allowed: "アプリケーションの連携を許可しました"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "En attente de {}"
     cancel: "Annuler"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "Jouer à Reversi avec vos amis·es !"
@@ -364,15 +368,15 @@ common/views/widgets/slideshow.vue:
 common/views/widgets/tips.vue:
   tips-line1: "<kbd>t</kbd>でタイムラインにフォーカスできます"
   tips-line2: "<kbd>p</kbd>または<kbd>n</kbd>で投稿フォームを開きます"
-  tips-line3: "投稿フォームにはファイルをドラッグ&ドロップできます"
+  tips-line3: "Vous pouvez glisser et déposer des fichiers sur la fenêtre de la note"
-  tips-line4: "投稿フォームにクリップボードにある画像データをペーストできます"
+  tips-line4: "Vous pouvez coller des images à partir du presse-papier sur la fenêtre de la note"
   tips-line5: "ドライブにファイルをドラッグ&ドロップしてアップロードできます"
   tips-line6: "ドライブでファイルをドラッグしてフォルダ移動できます"
   tips-line7: "ドライブでフォルダをドラッグしてフォルダ移動できます"
   tips-line8: "Vous pouvez personnaliser l'Accueil via les paramètres"
   tips-line9: "Misskey est sous licence AGPLv3"
   tips-line10: "タイムマシンウィジェットを利用すると、簡単に過去のタイムラインに遡れます"
-  tips-line11: "投稿の ... をクリックして、投稿をユーザーページにピン留めできます"
+  tips-line11: "Vous pouvez épingler des notes sur votre page en appuyant sur \"…\""
   tips-line13: "Tous les fichiers attachés à cette publication sont sauvegardés dans le Drive"
   tips-line14: "ホームのカスタマイズ中、ウィジェットを右クリックしてデザインを変更できます"
   tips-line17: "「**」でテキストを囲むと**強調表示**されます"

locales/it.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/ja.yml

@@ -95,6 +95,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
 
   reversi:
     drawn: "引き分け"
@@ -182,6 +183,10 @@ common/views/components/games/reversi/reversi.vue:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
 
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
+
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/ko.yml

@@ -1,6 +1,6 @@
 ---
 meta:
-  lang: "日本語"
+  lang: "한국어"
   divider: ""
 common:
   misskey: "A ⭐ of fediverse"
@@ -88,6 +88,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/pl.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "Wolę sushi od puddingu"
   show-reversi-board-labels: "Pokazuj podpisy wierszy i kolumn w Reversi"
   verified-user: "Zweryfikowany użytkownik"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "Remis"
     my-turn: "Twoja kolej"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/pt.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/ru.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

locales/zh.yml

@@ -88,6 +88,7 @@ common:
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   verified-user: "認証済みのユーザー"
+  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -168,6 +169,9 @@ common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "{}を待っています"
     cancel: "キャンセル"
+common/views/components/games/reversi/reversi.game.vue:
+  surrender: "投了"
+  surrendered: "投了により"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "5.13.2",
+	"version": "5.14.0",
-	"clientVersion": "1.0.7967",
+	"clientVersion": "1.0.7997",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/common/views/components/games/reversi/reversi.game.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="xqnhankfuuilcwvhgsopeqncafzsquya">
-	<header><b>{{ blackUser | userName }}</b>(%i18n:common.reversi.black%) vs <b>{{ whiteUser | userName }}</b>(%i18n:common.reversi.white%)</header>
+	<header><b><router-link :to="blackUser | userPage">{{ blackUser | userName }}</router-link></b>(%i18n:common.reversi.black%) vs <b><router-link :to="whiteUser | userPage">{{ whiteUser | userName }}</router-link></b>(%i18n:common.reversi.white%)</header>
 
 	<div style="overflow: hidden">
 		<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ '%i18n:common.reversi.turn-of%'.replace('{}', $options.filters.userName(turnUser)) }}<mk-ellipsis/></p>
@@ -8,7 +8,10 @@
 		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">%i18n:common.reversi.opponent-turn%<mk-ellipsis/></p>
 		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">%i18n:common.reversi.my-turn%</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
-			<template v-if="game.winner">{{ '%i18n:common.reversi.won%'.replace('{}', $options.filters.userName(game.winner)) }}{{ game.settings.isLlotheo ? ' (ロセオ)' : '' }}</template>
+			<template v-if="game.winner">
+				<span>{{ '%i18n:common.reversi.won%'.replace('{}', $options.filters.userName(game.winner)) }}</span>
+				<span v-if="game.surrendered != null"> (%i18n:@surrendered%)</span>
+			</template>
 			<template v-else>%i18n:common.reversi.drawn%</template>
 		</p>
 	</div>
@@ -41,6 +44,10 @@
 
 	<p class="status"><b>{{ '%i18n:common.reversi.this-turn%'.split('{}')[0] }}{{ logPos }}{{ '%i18n:common.reversi.this-turn%'.split('{}')[1] }}</b> %i18n:common.reversi.black%:{{ o.blackCount }} %i18n:common.reversi.white%:{{ o.whiteCount }} %i18n:common.reversi.total%:{{ o.blackCount + o.whiteCount }}</p>
 
+	<div class="actions" v-if="!game.isEnded && iAmPlayer">
+		<form-button @click="surrender">%i18n:@surrender%</form-button>
+	</div>
+
 	<div class="player" v-if="game.isEnded">
 		<el-button-group>
 			<el-button type="primary" @click="logPos = 0" :disabled="logPos == 0">%fa:angle-double-left%</el-button>
@@ -79,22 +86,27 @@ export default Vue.extend({
 			if (!this.$store.getters.isSignedIn) return false;
 			return this.game.user1Id == this.$store.state.i.id || this.game.user2Id == this.$store.state.i.id;
 		},
+
 		myColor(): Color {
 			if (!this.iAmPlayer) return null;
 			if (this.game.user1Id == this.$store.state.i.id && this.game.black == 1) return true;
 			if (this.game.user2Id == this.$store.state.i.id && this.game.black == 2) return true;
 			return false;
 		},
+
 		opColor(): Color {
 			if (!this.iAmPlayer) return null;
 			return this.myColor === true ? false : true;
 		},
+
 		blackUser(): any {
 			return this.game.black == 1 ? this.game.user1 : this.game.user2;
 		},
+
 		whiteUser(): any {
 			return this.game.black == 1 ? this.game.user2 : this.game.user1;
 		},
+
 		turnUser(): any {
 			if (this.o.turn === true) {
 				return this.game.black == 1 ? this.game.user1 : this.game.user2;
@@ -104,11 +116,13 @@ export default Vue.extend({
 				return null;
 			}
 		},
+
 		isMyTurn(): boolean {
 			if (!this.iAmPlayer) return false;
 			if (this.turnUser == null) return false;
 			return this.turnUser.id == this.$store.state.i.id;
 		},
+
 		cellsStyle(): any {
 			return {
 				'grid-template-rows': `repeat(${this.game.settings.map.length}, 1fr)`,
@@ -165,11 +179,13 @@ export default Vue.extend({
 	mounted() {
 		this.connection.on('set', this.onSet);
 		this.connection.on('rescue', this.onRescue);
+		this.connection.on('ended', this.onEnded);
 	},
 
 	beforeDestroy() {
 		this.connection.off('set', this.onSet);
 		this.connection.off('rescue', this.onRescue);
+		this.connection.off('ended', this.onEnded);
 
 		clearInterval(this.pollingClock);
 	},
@@ -215,6 +231,10 @@ export default Vue.extend({
 			}
 		},
 
+		onEnded(x) {
+			this.game = x.game;
+		},
+
 		checkEnd() {
 			this.game.isEnded = this.o.isEnded;
 			if (this.game.isEnded) {
@@ -250,6 +270,12 @@ export default Vue.extend({
 
 			this.checkEnd();
 			this.$forceUpdate();
+		},
+
+		surrender() {
+			(this as any).api('games/reversi/games/surrender', {
+				gameId: this.game.id
+			});
 		}
 	}
 });
@@ -265,6 +291,9 @@ root(isDark)
 		padding 8px
 		border-bottom dashed 1px isDark ? #4c5761 : #c4cdd4
 
+		a
+			color inherit
+
 	> .board
 		width calc(100% - 16px)
 		max-width 500px
@@ -381,6 +410,9 @@ root(isDark)
 		margin 0
 		padding 16px 0
 
+	> .actions
+		padding-bottom 16px
+
 	> .player
 		padding-bottom 32px
 

src/client/app/common/views/components/misskey-flavored-markdown.ts

@@ -63,7 +63,7 @@ export default Vue.component('misskey-flavored-markdown', {
 						attrs: {
 							style: 'display: inline-block; font-size: 200%;'
 						},
-						directives: [{
+						directives: [this.$store.state.settings.disableAnimatedMfm ? {} : {
 							name: 'animate-css',
 							value: { classes: 'tada', iteration: 'infinite' }
 						}]

src/client/app/desktop/views/components/settings.vue

@@ -55,6 +55,7 @@
 				<span>%i18n:@show-maps-desc%</span>
 			</mk-switch>
 			<mk-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels" text="%i18n:common.show-reversi-board-labels%"/>
+			<mk-switch v-model="$store.state.settings.disableAnimatedMfm" @change="onChangeDisableAnimatedMfm" text="%i18n:common.disable-animated-mfm%"/>
 		</section>
 
 		<section class="web" v-show="page == 'web'">
@@ -376,6 +377,12 @@ export default Vue.extend({
 				value: v
 			});
 		},
+		onChangeDisableAnimatedMfm(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'disableAnimatedMfm',
+				value: v
+			});
+		},
 		onChangeGradientWindowHeader(v) {
 			this.$store.dispatch('settings/set', {
 				key: 'gradientWindowHeader',

src/client/app/mobile/views/pages/settings.vue

@@ -14,6 +14,7 @@
 				<ui-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons">%i18n:@circle-icons%</ui-switch>
 				<ui-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi">%i18n:common.i-like-sushi%</ui-switch>
 				<ui-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
+				<ui-switch v-model="$store.state.settings.disableAnimatedMfm" @change="onChangeDisableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
 
 				<div>
 					<div>%i18n:@timeline%</div>
@@ -192,6 +193,13 @@ export default Vue.extend({
 			});
 		},
 
+		onChangeDisableAnimatedMfm(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'disableAnimatedMfm',
+				value: v
+			});
+		},
+
 		onChangeShowReplyTarget(v) {
 			this.$store.dispatch('settings/set', {
 				key: 'showReplyTarget',

src/docs/reversi-bot.ja.md

@@ -172,3 +172,6 @@ type: `textbox`
 }
 ```
 メッセージの種類: `success`, `info`, `warning`, `error`。
+
+## 投了する
+投了をするには、<a href="./api/endpoints/games/reversi/games/surrender">このエンドポイント</a>にリクエストします。

src/models/games/reversi/game.ts

@@ -25,6 +25,7 @@ export interface IReversiGame {
 	isStarted: boolean;
 	isEnded: boolean;
 	winnerId: mongo.ObjectID;
+	surrendered: mongo.ObjectID;
 	logs: Array<{
 		at: Date;
 		color: boolean;

src/server/api/endpoints/games/reversi/games/surrender.ts

@@ -0,0 +1,59 @@
+import $ from 'cafy'; import ID from '../../../../../../misc/cafy-id';
+import ReversiGame, { pack } from '../../../../../../models/games/reversi/game';
+import { ILocalUser } from '../../../../../../models/user';
+import getParams from '../../../../get-params';
+import { publishReversiGameStream } from '../../../../../../stream';
+
+export const meta = {
+	desc: {
+		ja: '指定したリバーシの対局で投了します。'
+	},
+
+	requireCredential: true,
+
+	params: {
+		gameId: $.type(ID).optional.note({
+			desc: {
+				ja: '投了したい対局'
+			}
+		})
+	}
+};
+
+export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) return rej(psErr);
+
+	const game = await ReversiGame.findOne({ _id: ps.gameId });
+
+	if (game == null) {
+		return rej('game not found');
+	}
+
+	if (game.isEnded) {
+		return rej('this game is already ended');
+	}
+
+	if (!game.user1Id.equals(user._id) && !game.user2Id.equals(user._id)) {
+		return rej('access denied');
+	}
+
+	const winnerId = game.user1Id.equals(user._id) ? game.user2Id : game.user1Id;
+
+	await ReversiGame.update({
+		_id: game._id
+	}, {
+		$set: {
+			surrendered: user._id,
+			isEnded: true,
+			winnerId: winnerId
+		}
+	});
+
+	publishReversiGameStream(game._id, 'ended', {
+		winnerId: winnerId,
+		game: await pack(game._id, user)
+	});
+
+	res();
+});