Merge branch 'develop'

This commit is contained in:
syuilo 2019-06-25 01:27:51 +09:00
commit 0500600cdd
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
6 changed files with 29 additions and 14 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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