Merge branch 'misskey-dev:develop' into sonic

locales/index.js

@@ -34,6 +34,7 @@ const languages = [
 	'pl-PL',
 	'pt-PT',
 	'ru-RU',
+	'sk-SK',
 	'ug-CN',
 	'uk-UA',
 	'zh-CN',

packages/backend/src/server/api/endpoints/meta.ts

@@ -4,6 +4,7 @@ import { fetchMeta } from '@/misc/fetch-meta';
 import { Ads, Emojis, Users } from '@/models/index';
 import { DB_MAX_NOTE_TEXT_LENGTH } from '@/misc/hard-limits';
 import { MoreThan } from 'typeorm';
+import { MAX_NOTE_TEXT_LENGTH } from '@/const';
 
 export const meta = {
 	tags: ['meta'],
@@ -138,6 +139,10 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
+			maxNoteTextLength: {
+				type: 'number',
+				optional: false, nullable: false,
+			},
 			emojis: {
 				type: 'array',
 				optional: false, nullable: false,
@@ -501,6 +506,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		iconUrl: instance.iconUrl,
 		backgroundImageUrl: instance.backgroundImageUrl,
 		logoImageUrl: instance.logoImageUrl,
+		maxNoteTextLength: MAX_NOTE_TEXT_LENGTH, // 後方互換性のため
 		emojis: await Emojis.packMany(emojis),
 		ads: ads.map(ad => ({
 			id: ad.id,

packages/client/src/pages/settings/profile.vue

@@ -48,8 +48,8 @@
 						</FormInput>
 					</FormSplit>
 				</div>
-				<MkButton :disabled="fields.length >= 16" inline style="margin-right: 8px;" @click="addField">{{ i18n.ts.add }}</MkButton>
-				<MkButton inline primary @click="saveFields">{{ i18n.ts.save }}</MkButton>
+				<MkButton :disabled="fields.length >= 16" inline style="margin-right: 8px;" @click="addField"><i class="fas fa-plus"></i> {{ i18n.ts.add }}</MkButton>
+				<MkButton inline primary @click="saveFields"><i class="fas fa-check"></i> {{ i18n.ts.save }}</MkButton>
 			</div>
 		</FormFolder>
 		<template #caption>{{ i18n.ts._profile.metadataDescription }}</template>