Merge branch 'develop'

CHANGELOG.md

@@ -17,6 +17,11 @@ npm i -g ts-node
 npm run migrate
 ```
 
+11.23.1 (2019/06/25)
+--------------------
+### 🐛Fixes
+* クライアントの設定がリセットされることがある問題を修正
+
 11.23.0 (2019/06/23)
 --------------------
 ### ✨Improvements

locales/zh-CN.yml

@@ -1947,6 +1947,7 @@ pages:
       _pick:
         arg1: "列表"
         arg2: "位置"
+      listLen: "获取列表长度"
       _listLen:
         arg1: "列表"
       number: "数值"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.23.0",
+	"version": "11.23.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",

src/client/app/common/views/deck/deck.notification.vue

@@ -4,8 +4,8 @@
 		<mk-avatar class="avatar" :user="notification.user"/>
 		<div>
 			<header>
-				<mk-reaction-icon :reaction="notification.reaction"/>
+				<mk-reaction-icon :reaction="notification.reaction" class="icon"/>
-				<router-link :to="notification.user | userPage">
+				<router-link :to="notification.user | userPage" class="name">
 					<mk-user-name :user="notification.user"/>
 				</router-link>
 				<mk-time :time="notification.createdAt"/>
@@ -22,8 +22,8 @@
 		<mk-avatar class="avatar" :user="notification.user"/>
 		<div>
 			<header>
-				<fa icon="retweet"/>
+				<fa icon="retweet" class="icon"/>
-				<router-link :to="notification.user | userPage">
+				<router-link :to="notification.user | userPage" class="name">
 					<mk-user-name :user="notification.user"/>
 				</router-link>
 				<mk-time :time="notification.createdAt"/>
@@ -40,8 +40,8 @@
 		<mk-avatar class="avatar" :user="notification.user"/>
 		<div>
 			<header>
-				<fa icon="user-plus"/>
+				<fa icon="user-plus" class="icon"/>
-				<router-link :to="notification.user | userPage">
+				<router-link :to="notification.user | userPage" class="name">
 					<mk-user-name :user="notification.user"/>
 				</router-link>
 				<mk-time :time="notification.createdAt"/>
@@ -53,9 +53,9 @@
 		<mk-avatar class="avatar" :user="notification.user"/>
 		<div>
 			<header>
-				<fa icon="user-clock"/>
+				<fa icon="user-clock" class="icon"/>
 				<router-link :to="notification.user | userPage">
-					<mk-user-name :user="notification.user"/>
+					<mk-user-name :user="notification.user" class="name"/>
 				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
@@ -66,9 +66,9 @@
 		<mk-avatar class="avatar" :user="notification.user"/>
 		<div>
 			<header>
-				<fa icon="chart-pie"/>
+				<fa icon="chart-pie" class="icon"/>
 				<router-link :to="notification.user | userPage">
-					<mk-user-name :user="notification.user"/>
+					<mk-user-name :user="notification.user" class="name"/>
 				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
@@ -137,9 +137,13 @@ export default Vue.extend({
 				align-items baseline
 				white-space nowrap
 
-				[data-icon], .mk-reaction-icon
+				> .icon
 					margin-right 4px
 
+				> .name
+					overflow hidden
+					text-overflow ellipsis
+
 				> .mk-time
 					margin-left auto
 					color var(--noteHeaderInfo)

src/misc/nyaize.ts

@@ -2,6 +2,8 @@ export function nyaize(text: string): string {
 	return text
 		// ja-JP
 		.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ')
+		// en-US
+		.replace(/morning/gi, 'mornyan').replace(/everyone/gi, 'everynyan')
 		// ko-KR
 		.replace(/[나-낳]/g, match => String.fromCharCode(
 			match.codePointAt(0)! + '냐'.charCodeAt(0) - '나'.charCodeAt(0)

src/server/api/endpoints/i/update-client-setting.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import { publishMainStream } from '../../../../services/stream';
 import define from '../../define';
 import { UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -20,11 +21,13 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne(user.id).then(ensure);
+
 	await UserProfiles.createQueryBuilder().update()
 		.set({
-			clientData: {
+			clientData: Object.assign(profile.clientData, {
 				[ps.name]: ps.value
-			},
+			}),
 		})
 		.where('userId = :id', { id: user.id })
 		.execute();