From 10928182034f1db668de422cda6461bd31aaaa73 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Wed, 22 May 2019 05:06:52 +0900
Subject: [PATCH 01/36] Add group update / transfer API

---
 locales/ja-JP.yml                             |  3 +
 .../common/views/pages/user-group-editor.vue  | 81 +++++++++++++++--
 src/client/app/init.ts                        |  2 +
 src/client/themes/dark.json5                  |  3 +
 src/client/themes/light.json5                 |  3 +
 src/models/repositories/user-group.ts         |  6 ++
 .../api/endpoints/users/groups/transfer.ts    | 86 +++++++++++++++++++
 .../api/endpoints/users/groups/update.ts      | 62 +++++++++++++
 8 files changed, 240 insertions(+), 6 deletions(-)
 create mode 100644 src/server/api/endpoints/users/groups/transfer.ts
 create mode 100644 src/server/api/endpoints/users/groups/update.ts

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 9047378849..c3eb0bb523 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -762,6 +762,9 @@ common/views/components/user-group-editor.vue:
   users: "メンバー"
   rename: "グループ名を変更"
   delete: "グループを削除"
+  transfer: "グループを譲渡"
+  transfer-are-you-sure: "グループ「$1」を「@$2」さんに譲渡しますか？"
+  transferred: "グループを譲渡しました"
   remove-user: "このグループから削除"
   delete-are-you-sure: "グループ「$1」を削除しますか？"
   deleted: "削除しました"
diff --git a/src/client/app/common/views/pages/user-group-editor.vue b/src/client/app/common/views/pages/user-group-editor.vue
index ef79689ae8..a32148cd7f 100644
--- a/src/client/app/common/views/pages/user-group-editor.vue
+++ b/src/client/app/common/views/pages/user-group-editor.vue
@@ -7,6 +7,7 @@
 			<ui-margin>
 				<ui-button @click="rename"><fa :icon="faICursor"/> {{ $t('rename') }}</ui-button>
 				<ui-button @click="del"><fa :icon="faTrashAlt"/> {{ $t('delete') }}</ui-button>
+				<ui-button @click="transfer"><fa :icon="faCrown"/> {{ $t('transfer') }}</ui-button>
 			</ui-margin>
 		</section>
 	</ui-container>
@@ -28,9 +29,10 @@
 					<div>
 						<header>
 							<b><mk-user-name :user="user"/></b>
+							<span class="is-owner" v-if="group.owner === user.id">owner</span>
 							<span class="username">@{{ user | acct }}</span>
 						</header>
-						<div>
+						<div v-if="group.owner !== user.id">
 							<a @click="remove(user)">{{ $t('remove-user') }}</a>
 						</div>
 					</div>
@@ -44,7 +46,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { faICursor, faUsers, faPlus } from '@fortawesome/free-solid-svg-icons';
+import { faCrown, faICursor, faUsers, faPlus } from '@fortawesome/free-solid-svg-icons';
 import { faTrashAlt } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
@@ -60,7 +62,7 @@ export default Vue.extend({
 		return {
 			group: null,
 			users: [],
-			faICursor, faTrashAlt, faUsers, faPlus
+			faCrown, faICursor, faTrashAlt, faUsers, faPlus
 		};
 	},
 
@@ -78,6 +80,14 @@ export default Vue.extend({
 	},
 
 	methods: {
+		fetchGroup() {
+			this.$root.api('users/groups/show', {
+				groupId: this.group.id
+			}).then(group => {
+				this.group = group;
+			})
+		},
+
 		fetchUsers() {
 			this.$root.api('users/show', {
 				userIds: this.group.userIds
@@ -97,8 +107,15 @@ export default Vue.extend({
 				this.$root.api('users/groups/update', {
 					groupId: this.group.id,
 					name: name
+				}).then(() => {
+					this.fetchGroup();
+				}).catch(e => {
+					this.$root.dialog({
+						type: 'error',
+						text: e
+					});
 				});
-			});
+			})
 		},
 
 		del() {
@@ -130,12 +147,17 @@ export default Vue.extend({
 				groupId: this.group.id,
 				userId: user.id
 			}).then(() => {
+				this.fetchGroup();
 				this.fetchUsers();
+			}).catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e
+				});
 			});
 		},
 
 		async invite() {
-			const t = this.$t('invited');
 			const { result: user } = await this.$root.dialog({
 				user: {
 					local: true
@@ -148,7 +170,44 @@ export default Vue.extend({
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',
-					text: t
+					text: this.$t('invited')
+				});
+			}).catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e
+				});
+			});
+		},
+
+		async transfer() {
+			const { result: user } = await this.$root.dialog({
+				user: {
+					local: true
+				}
+			});
+			if (user == null) return;
+
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('transfer-are-you-sure').replace('$1', this.group.name).replace('$2', user.username),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+
+				this.$root.api('users/groups/transfer', {
+					groupId: this.group.id,
+					userId: user.id
+				}).then(() => {
+					this.$root.dialog({
+						type: 'success',
+						text: this.$t('transferred')
+					});
+				}).catch(e => {
+					this.$root.dialog({
+						type: 'error',
+						text: e
+					});
 				});
 			});
 		}
@@ -179,6 +238,16 @@ export default Vue.extend({
 			> header
 				color var(--text)
 
+				> .is-owner
+					flex-shrink 0
+					align-self center
+					margin-left 8px
+					padding 1px 6px
+					font-size 80%
+					background var(--groupUserListOwnerBg)
+					color var(--groupUserListOwnerFg)
+					border-radius 3px
+
 				> .username
 					margin-left 8px
 					opacity 0.7
diff --git a/src/client/app/init.ts b/src/client/app/init.ts
index da7baff4fe..52da380e84 100644
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@@ -78,6 +78,7 @@ import {
 	faKey,
 	faBan,
 	faCogs,
+	faCrown,
 	faUnlockAlt,
 	faPuzzlePiece,
 	faMobileAlt,
@@ -210,6 +211,7 @@ library.add(
 	faKey,
 	faBan,
 	faCogs,
+	faCrown,
 	faUnlockAlt,
 	faPuzzlePiece,
 	faMobileAlt,
diff --git a/src/client/themes/dark.json5 b/src/client/themes/dark.json5
index 8e0c726b4c..0665d59901 100644
--- a/src/client/themes/dark.json5
+++ b/src/client/themes/dark.json5
@@ -235,5 +235,8 @@
 
 		pageBlockBorder: 'rgba(255, 255, 255, 0.1)',
 		pageBlockBorderHover: 'rgba(255, 255, 255, 0.15)',
+
+		groupUserListOwnerFg: '#f15f71',
+		groupUserListOwnerBg: '#5d282e'
 	},
 }
diff --git a/src/client/themes/light.json5 b/src/client/themes/light.json5
index 1fff18176a..cbe456ca5d 100644
--- a/src/client/themes/light.json5
+++ b/src/client/themes/light.json5
@@ -235,5 +235,8 @@
 
 		pageBlockBorder: 'rgba(0, 0, 0, 0.1)',
 		pageBlockBorderHover: 'rgba(0, 0, 0, 0.15)',
+
+		groupUserListOwnerFg: '#f15f71',
+		groupUserListOwnerBg: '#ffdfdf'
 	},
 }
diff --git a/src/models/repositories/user-group.ts b/src/models/repositories/user-group.ts
index 8bb1ae8330..dbbe8bf84c 100644
--- a/src/models/repositories/user-group.ts
+++ b/src/models/repositories/user-group.ts
@@ -21,6 +21,7 @@ export class UserGroupRepository extends Repository<UserGroup> {
 			id: userGroup.id,
 			createdAt: userGroup.createdAt.toISOString(),
 			name: userGroup.name,
+			owner: userGroup.userId,
 			userIds: users.map(x => x.userId)
 		};
 	}
@@ -48,6 +49,11 @@ export const packedUserGroupSchema = {
 			optional: bool.false, nullable: bool.false,
 			description: 'The name of the UserGroup.'
 		},
+		owner: {
+			type: types.string,
+			nullable: bool.false, optional: bool.false,
+			format: 'id',
+		},
 		userIds: {
 			type: types.array,
 			nullable: bool.false, optional: bool.true,
diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts
new file mode 100644
index 0000000000..3baa182abf
--- /dev/null
+++ b/src/server/api/endpoints/users/groups/transfer.ts
@@ -0,0 +1,86 @@
+import $ from 'cafy';
+import { ID } from '../../../../../misc/cafy-id';
+import define from '../../../define';
+import { ApiError } from '../../../error';
+import { getUser } from '../../../common/getters';
+import { UserGroups, UserGroupJoinings } from '../../../../../models';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したユーザーグループを指定したユーザーグループ内のユーザーに譲渡します。',
+		'en-US': 'Transfer user group ownership to another user in group.'
+	},
+
+	tags: ['groups', 'users'],
+
+	requireCredential: true,
+
+	kind: 'write:user-groups',
+
+	params: {
+		groupId: {
+			validator: $.type(ID),
+		},
+
+		userId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '対象のユーザーのID',
+				'en-US': 'Target user ID'
+			}
+		},
+	},
+
+	errors: {
+		noSuchGroup: {
+			message: 'No such group.',
+			code: 'NO_SUCH_GROUP',
+			id: '8e31d36b-2f88-4ccd-a438-e2d78a9162db'
+		},
+
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '711f7ebb-bbb9-4dfa-b540-b27809fed5e9'
+		},
+
+		noSuchGroupMember: {
+			message: 'No such group member.',
+			code: 'NO_SUCH_GROUP_MEMBER',
+			id: 'd31bebee-196d-42c2-9a3e-9474d4be6cc4'
+		},
+	}
+};
+
+export default define(meta, async (ps, me) => {
+	// Fetch the group
+	const userGroup = await UserGroups.findOne({
+		id: ps.groupId,
+		userId: me.id,
+	});
+
+	if (userGroup == null) {
+		throw new ApiError(meta.errors.noSuchGroup);
+	}
+
+	// Fetch the user
+	const user = await getUser(ps.userId).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
+	});
+
+	const joining = await UserGroupJoinings.findOne({
+		userGroupId: userGroup.id,
+		userId: user.id
+	});
+
+	if (!joining) {
+		throw new ApiError(meta.errors.noSuchGroupMember);
+	}
+
+	await UserGroups.update(userGroup.id, {
+		userId: ps.userId
+	});
+
+	return await UserGroups.pack(userGroup.id);
+});
diff --git a/src/server/api/endpoints/users/groups/update.ts b/src/server/api/endpoints/users/groups/update.ts
new file mode 100644
index 0000000000..ad9a1faa23
--- /dev/null
+++ b/src/server/api/endpoints/users/groups/update.ts
@@ -0,0 +1,62 @@
+import $ from 'cafy';
+import { ID } from '../../../../../misc/cafy-id';
+import define from '../../../define';
+import { ApiError } from '../../../error';
+import { UserGroups } from '../../../../../models';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定したユーザーグループを更新します。',
+		'en-US': 'Update a user group'
+	},
+
+	tags: ['groups'],
+
+	requireCredential: true,
+
+	kind: 'write:user-groups',
+
+	params: {
+		groupId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '対象となるユーザーグループのID',
+				'en-US': 'ID of target user group'
+			}
+		},
+
+		name: {
+			validator: $.str.range(1, 100),
+			desc: {
+				'ja-JP': 'このユーザーグループの名前',
+				'en-US': 'name of this user group'
+			}
+		}
+	},
+
+	errors: {
+		noSuchGroup: {
+			message: 'No such group.',
+			code: 'NO_SUCH_GROUP',
+			id: '9081cda3-7a9e-4fac-a6ce-908d70f282f6'
+		},
+	}
+};
+
+export default define(meta, async (ps, me) => {
+	// Fetch the group
+	const userGroup = await UserGroups.findOne({
+		id: ps.groupId,
+		userId: me.id
+	});
+
+	if (userGroup == null) {
+		throw new ApiError(meta.errors.noSuchGroup);
+	}
+
+	await UserGroups.update(userGroup.id, {
+		name: ps.name
+	});
+
+	return await UserGroups.pack(userGroup.id);
+});

From aa1d2545b3894dc6e2f9e1fb73e13645c28df399 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Wed, 22 May 2019 12:25:14 +0900
Subject: [PATCH 02/36] Fetch joined groups on accept group invites (#4956)

---
 src/client/app/common/views/pages/user-groups.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/client/app/common/views/pages/user-groups.vue b/src/client/app/common/views/pages/user-groups.vue
index f5609d690d..a51a5f723f 100644
--- a/src/client/app/common/views/pages/user-groups.vue
+++ b/src/client/app/common/views/pages/user-groups.vue
@@ -103,6 +103,10 @@ export default Vue.extend({
 				});
 				this.$root.api('i/user-group-invites').then(invites => {
 					this.invites = invites;
+				}).then(() => {
+					this.$root.api('users/groups/joined').then(groups => {
+						this.joinedGroups = groups;
+					});
 				});
 			});
 		},

From c1524d9beffe3daaa64c515a6a63ced5e34a3e9e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 May 2019 12:54:28 +0900
Subject: [PATCH 03/36] =?UTF-8?q?=E3=83=87=E3=83=83=E3=82=AD=E3=81=A7?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC=E7=94=B3=E8=AB=8B=E3=82=92?=
 =?UTF-8?q?=E8=A6=8B=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/views/pages/follow-requests.vue | 7 +++++++
 src/client/app/desktop/script.ts                      | 1 +
 src/client/app/mobile/script.ts                       | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/client/app/common/views/pages/follow-requests.vue b/src/client/app/common/views/pages/follow-requests.vue
index 146d4b0c94..e5b6e2902d 100644
--- a/src/client/app/common/views/pages/follow-requests.vue
+++ b/src/client/app/common/views/pages/follow-requests.vue
@@ -22,6 +22,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import Progress from '../../scripts/loading';
+import { faUserClock } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('common/views/pages/follow-requests.vue'),
@@ -31,6 +32,12 @@ export default Vue.extend({
 			requests: []
 		};
 	},
+	created() {
+		this.$emit('init', {
+			title: this.$t('received-follow-requests'),
+			icon: faUserClock
+		});
+	},
 	mounted() {
 		Progress.start();
 		this.$root.api('following/requests/list').then(requests => {
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 845f8ee5c0..b283ab2075 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -146,6 +146,7 @@ init(async (launch, os) => {
 					{ path: '/i/lists/:listId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-list-editor.vue').then(m => m.default), listId: route.params.listId }) },
 					{ path: '/i/groups', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }) },
 					{ path: '/i/groups/:groupId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default), groupId: route.params.groupId }) },
+					{ path: '/i/follow-requests', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }) },
 				]}
 				: { path: '/', component: MkHome, children: [
 					{ path: '', name: 'index', component: MkHomeTimeline },
diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts
index 7a80f21759..106e843ca8 100644
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -128,6 +128,7 @@ init((launch, os) => {
 					{ path: '/i/lists/:listId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-list-editor.vue').then(m => m.default), listId: route.params.listId }) },
 					{ path: '/i/groups', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }) },
 					{ path: '/i/groups/:groupId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default), groupId: route.params.groupId }) },
+					{ path: '/i/follow-requests', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }) },
 				]}]
 			: [
 				{ path: '/', name: 'index', component: MkIndex },

From c7456224af3fbe39b3207f936781ac9b09a37a5f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 May 2019 12:55:53 +0900
Subject: [PATCH 04/36] Fix bug

---
 src/client/app/common/views/pages/user-group-editor.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/app/common/views/pages/user-group-editor.vue b/src/client/app/common/views/pages/user-group-editor.vue
index a32148cd7f..3cfecd837f 100644
--- a/src/client/app/common/views/pages/user-group-editor.vue
+++ b/src/client/app/common/views/pages/user-group-editor.vue
@@ -158,6 +158,7 @@ export default Vue.extend({
 		},
 
 		async invite() {
+			const t = this.$t('invited');
 			const { result: user } = await this.$root.dialog({
 				user: {
 					local: true
@@ -170,7 +171,7 @@ export default Vue.extend({
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',
-					text: this.$t('invited')
+					text: t
 				});
 			}).catch(e => {
 				this.$root.dialog({

From 50d4de19f0d93c78f70f7821bd9798317bd6b8d6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 May 2019 12:56:42 +0900
Subject: [PATCH 05/36] Clean up

---
 src/client/app/init.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/client/app/init.ts b/src/client/app/init.ts
index 52da380e84..da7baff4fe 100644
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@@ -78,7 +78,6 @@ import {
 	faKey,
 	faBan,
 	faCogs,
-	faCrown,
 	faUnlockAlt,
 	faPuzzlePiece,
 	faMobileAlt,
@@ -211,7 +210,6 @@ library.add(
 	faKey,
 	faBan,
 	faCogs,
-	faCrown,
 	faUnlockAlt,
 	faPuzzlePiece,
 	faMobileAlt,

From 4a88cb596815c77630be7d01d40687c49b0560d2 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 May 2019 12:58:44 +0900
Subject: [PATCH 06/36] rename

---
 src/models/repositories/user-group.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/models/repositories/user-group.ts b/src/models/repositories/user-group.ts
index dbbe8bf84c..38174ce235 100644
--- a/src/models/repositories/user-group.ts
+++ b/src/models/repositories/user-group.ts
@@ -21,7 +21,7 @@ export class UserGroupRepository extends Repository<UserGroup> {
 			id: userGroup.id,
 			createdAt: userGroup.createdAt.toISOString(),
 			name: userGroup.name,
-			owner: userGroup.userId,
+			ownerId: userGroup.userId,
 			userIds: users.map(x => x.userId)
 		};
 	}
@@ -49,7 +49,7 @@ export const packedUserGroupSchema = {
 			optional: bool.false, nullable: bool.false,
 			description: 'The name of the UserGroup.'
 		},
-		owner: {
+		ownerId: {
 			type: types.string,
 			nullable: bool.false, optional: bool.false,
 			format: 'id',

From eed9266ecbc26282dcc349eaacaa49d8d3a812e1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 May 2019 12:58:53 +0900
Subject: [PATCH 07/36] align format

---
 src/server/api/endpoints/users/groups/transfer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts
index 3baa182abf..ca0ab9ab29 100644
--- a/src/server/api/endpoints/users/groups/transfer.ts
+++ b/src/server/api/endpoints/users/groups/transfer.ts
@@ -74,7 +74,7 @@ export default define(meta, async (ps, me) => {
 		userId: user.id
 	});
 
-	if (!joining) {
+	if (joining == null) {
 		throw new ApiError(meta.errors.noSuchGroupMember);
 	}
 

From 9d75ec799b15758b6da69575ab8355735e036f28 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 May 2019 13:00:36 +0900
Subject: [PATCH 08/36] Better deninition

---
 src/server/api/endpoints/users/groups/transfer.ts | 7 +++++++
 src/server/api/endpoints/users/groups/update.ts   | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts
index ca0ab9ab29..b4284ab484 100644
--- a/src/server/api/endpoints/users/groups/transfer.ts
+++ b/src/server/api/endpoints/users/groups/transfer.ts
@@ -4,6 +4,7 @@ import define from '../../../define';
 import { ApiError } from '../../../error';
 import { getUser } from '../../../common/getters';
 import { UserGroups, UserGroupJoinings } from '../../../../../models';
+import { types, bool } from '../../../../../misc/schema';
 
 export const meta = {
 	desc: {
@@ -31,6 +32,12 @@ export const meta = {
 		},
 	},
 
+	res: {
+		type: types.object,
+		optional: bool.false, nullable: bool.false,
+		ref: 'UserGroup',
+	},
+
 	errors: {
 		noSuchGroup: {
 			message: 'No such group.',
diff --git a/src/server/api/endpoints/users/groups/update.ts b/src/server/api/endpoints/users/groups/update.ts
index ad9a1faa23..bc974621a3 100644
--- a/src/server/api/endpoints/users/groups/update.ts
+++ b/src/server/api/endpoints/users/groups/update.ts
@@ -3,6 +3,7 @@ import { ID } from '../../../../../misc/cafy-id';
 import define from '../../../define';
 import { ApiError } from '../../../error';
 import { UserGroups } from '../../../../../models';
+import { types, bool } from '../../../../../misc/schema';
 
 export const meta = {
 	desc: {
@@ -34,6 +35,12 @@ export const meta = {
 		}
 	},
 
+	res: {
+		type: types.object,
+		optional: bool.false, nullable: bool.false,
+		ref: 'UserGroup',
+	},
+
 	errors: {
 		noSuchGroup: {
 			message: 'No such group.',

From 14a774c7236378ca79b05909a3cc6d7497de4a5f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 May 2019 13:07:58 +0900
Subject: [PATCH 09/36] Fix bug

---
 src/client/app/common/views/deck/deck.user-column.home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue
index ad05d6548b..c30cb397e4 100644
--- a/src/client/app/common/views/deck/deck.user-column.home.vue
+++ b/src/client/app/common/views/deck/deck.user-column.home.vue
@@ -30,7 +30,7 @@
 	<ui-container>
 		<template #header><fa :icon="['far', 'comment-alt']"/> {{ $t('timeline') }}</template>
 		<div>
-			<x-notes ref="timeline" :pagination="pagination" @inited="() => $emit('loaded')"/>
+			<x-notes ref="timeline" :pagination="pagination" @inited="() => $emit('loaded')" :key="user.id"/>
 		</div>
 	</ui-container>
 </div>

From 9cfb72810c0919e4aa739ebe4110f0ffa7ff4ed0 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Wed, 22 May 2019 14:27:10 +0900
Subject: [PATCH 10/36] Fix bug (#4958)

4a88cb59
---
 src/client/app/common/views/pages/user-group-editor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/app/common/views/pages/user-group-editor.vue b/src/client/app/common/views/pages/user-group-editor.vue
index 3cfecd837f..9cc012af7a 100644
--- a/src/client/app/common/views/pages/user-group-editor.vue
+++ b/src/client/app/common/views/pages/user-group-editor.vue
@@ -29,10 +29,10 @@
 					<div>
 						<header>
 							<b><mk-user-name :user="user"/></b>
-							<span class="is-owner" v-if="group.owner === user.id">owner</span>
+							<span class="is-owner" v-if="group.ownerId === user.id">owner</span>
 							<span class="username">@{{ user | acct }}</span>
 						</header>
-						<div v-if="group.owner !== user.id">
+						<div v-if="group.ownerId !== user.id">
 							<a @click="remove(user)">{{ $t('remove-user') }}</a>
 						</div>
 					</div>

From 1e1a7ee85888a74e9b7a58f833ed7da0a9ed1122 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 May 2019 13:38:07 +0900
Subject: [PATCH 11/36] Add info

---
 locales/ja-JP.yml                       | 1 +
 src/client/app/admin/views/instance.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c3eb0bb523..48c4c36828 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1281,6 +1281,7 @@ admin/views/instance.vue:
   mb: "メガバイト単位"
   recaptcha-config: "reCAPTCHAの設定"
   recaptcha-info: "reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。"
+  recaptcha-info2: "v3は非対応です。v2を使用してください。"
   enable-recaptcha: "reCAPTCHAを有効にする"
   recaptcha-site-key: "サイトキー"
   recaptcha-secret-key: "シークレットキー"
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue
index 72ae3384b5..c4d445fbb8 100644
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -159,6 +159,7 @@
 			<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
 			<template v-if="enableRecaptcha">
 				<ui-info>{{ $t('recaptcha-info') }}</ui-info>
+				<ui-info warn>{{ $t('recaptcha-info2') }}</ui-info>
 				<ui-horizon-group inputs>
 					<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><template #icon><fa icon="key"/></template>{{ $t('recaptcha-site-key') }}</ui-input>
 					<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><template #icon><fa icon="key"/></template>{{ $t('recaptcha-secret-key') }}</ui-input>

From 9c8d26affad32fadba91ca733fdcce8578e93db6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 May 2019 14:11:42 +0900
Subject: [PATCH 12/36] Resolve #4967

---
 src/client/app/admin/views/logs.vue           | 11 +++++++++++
 src/server/api/endpoints/admin/delete-logs.ts | 13 +++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 src/server/api/endpoints/admin/delete-logs.ts

diff --git a/src/client/app/admin/views/logs.vue b/src/client/app/admin/views/logs.vue
index 5c2cfdb396..cb54318187 100644
--- a/src/client/app/admin/views/logs.vue
+++ b/src/client/app/admin/views/logs.vue
@@ -26,6 +26,8 @@
 					</details>
 				</code>
 			</div>
+
+			<ui-button @click="deleteAll()">{{ $t('delete-all') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -78,6 +80,15 @@ export default Vue.extend({
 			}).then(logs => {
 				this.logs = logs.reverse();
 			});
+		},
+
+		deleteAll() {
+			this.$root.api('admin/delete-logs').then(() => {
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
 		}
 	}
 });
diff --git a/src/server/api/endpoints/admin/delete-logs.ts b/src/server/api/endpoints/admin/delete-logs.ts
new file mode 100644
index 0000000000..26cf13c1f6
--- /dev/null
+++ b/src/server/api/endpoints/admin/delete-logs.ts
@@ -0,0 +1,13 @@
+import define from '../../define';
+import { Logs } from '../../../../models';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+};
+
+export default define(meta, async (ps) => {
+	await Logs.delete({});
+});

From 3ed9e1ff3f3dd74e4aebd5cd351ab9dbdccc83d6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 23 May 2019 22:43:24 +0900
Subject: [PATCH 13/36] Create FUNDING.yml

---
 .github/FUNDING.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..c6b2a1611c
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: syuilo

From dda7b0c80e1785e1979b088a32d7b47a763bb6a3 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 May 2019 23:46:10 +0900
Subject: [PATCH 14/36] Refactor

---
 src/server/api/endpoints/i/update-email.ts | 33 ++------------------
 src/services/send-email.ts                 | 36 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 31 deletions(-)
 create mode 100644 src/services/send-email.ts

diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts
index d4b9721d82..56284499d3 100644
--- a/src/server/api/endpoints/i/update-email.ts
+++ b/src/server/api/endpoints/i/update-email.ts
@@ -1,15 +1,13 @@
 import $ from 'cafy';
 import { publishMainStream } from '../../../../services/stream';
 import define from '../../define';
-import * as nodemailer from 'nodemailer';
-import { fetchMeta } from '../../../../misc/fetch-meta';
 import rndstr from 'rndstr';
 import config from '../../../../config';
 import * as ms from 'ms';
 import * as bcrypt from 'bcryptjs';
-import { apiLogger } from '../../logger';
 import { Users, UserProfiles } from '../../../../models';
 import { ensure } from '../../../../prelude/ensure';
+import { sendEmail } from '../../../../services/send-email';
 
 export const meta = {
 	requireCredential: true,
@@ -63,36 +61,9 @@ export default define(meta, async (ps, user) => {
 			emailVerifyCode: code
 		});
 
-		const meta = await fetchMeta(true);
-
-		const enableAuth = meta.smtpUser != null && meta.smtpUser !== '';
-
-		const transporter = nodemailer.createTransport({
-			host: meta.smtpHost,
-			port: meta.smtpPort,
-			secure: meta.smtpSecure,
-			ignoreTLS: !enableAuth,
-			auth: enableAuth ? {
-				user: meta.smtpUser,
-				pass: meta.smtpPass
-			} : undefined
-		} as any);
-
 		const link = `${config.url}/verify-email/${code}`;
 
-		transporter.sendMail({
-			from: meta.email!,
-			to: ps.email,
-			subject: meta.name || 'Misskey',
-			text: `To verify email, please click this link: ${link}`
-		}, (error, info) => {
-			if (error) {
-				apiLogger.error(error);
-				return;
-			}
-
-			apiLogger.info('Message sent: %s', info.messageId);
-		});
+		sendEmail(ps.email, 'Email verification', `To verify email, please click this link: ${link}`);
 	}
 
 	return iObj;
diff --git a/src/services/send-email.ts b/src/services/send-email.ts
new file mode 100644
index 0000000000..8818c5fcde
--- /dev/null
+++ b/src/services/send-email.ts
@@ -0,0 +1,36 @@
+import * as nodemailer from 'nodemailer';
+import { fetchMeta } from '../misc/fetch-meta';
+import Logger from './logger';
+
+export const logger = new Logger('email');
+
+export async function sendEmail(to: string, subject: string, text: string) {
+	const meta = await fetchMeta(true);
+
+	const enableAuth = meta.smtpUser != null && meta.smtpUser !== '';
+
+	const transporter = nodemailer.createTransport({
+		host: meta.smtpHost,
+		port: meta.smtpPort,
+		secure: meta.smtpSecure,
+		ignoreTLS: !enableAuth,
+		auth: enableAuth ? {
+			user: meta.smtpUser,
+			pass: meta.smtpPass
+		} : undefined
+	} as any);
+
+	try {
+		const info = await transporter.sendMail({
+			from: meta.email!,
+			to: to,
+			subject: subject || 'Misskey',
+			text: text
+		});
+
+		logger.info('Message sent: %s', info.messageId);
+	} catch (e) {
+		logger.error(e);
+		throw e;
+	}
+}

From 6de08d07a3d5cc4db2c9900f59a66ccca8643918 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 24 May 2019 03:26:56 +0900
Subject: [PATCH 15/36] Support PostgreSQL Extra Connection options (#4970)

---
 .config/example.yml | 4 ++++
 src/config/types.ts | 1 +
 src/db/postgre.ts   | 1 +
 src/ormconfig.ts    | 1 +
 4 files changed, 7 insertions(+)

diff --git a/.config/example.yml b/.config/example.yml
index 0babd037c5..503471d937 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -62,6 +62,10 @@ db:
   user: example-misskey-user
   pass: example-misskey-pass
 
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 
diff --git a/src/config/types.ts b/src/config/types.ts
index 7da9820f22..c35bc63573 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -14,6 +14,7 @@ export type Source = {
 		db: string;
 		user: string;
 		pass: string;
+		extra?: { [x: string]: string };
 	};
 	redis: {
 		host: string;
diff --git a/src/db/postgre.ts b/src/db/postgre.ts
index fcec68602f..04893efe2c 100644
--- a/src/db/postgre.ts
+++ b/src/db/postgre.ts
@@ -93,6 +93,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
 		username: config.db.user,
 		password: config.db.pass,
 		database: config.db.db,
+		extra: config.db.extra,
 		synchronize: process.env.NODE_ENV === 'test' || sync,
 		dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
 		logging: log,
diff --git a/src/ormconfig.ts b/src/ormconfig.ts
index 91f33181f4..6b7297b2c3 100644
--- a/src/ormconfig.ts
+++ b/src/ormconfig.ts
@@ -8,6 +8,7 @@ const json = {
 	username: config.db.user,
 	password: config.db.pass,
 	database: config.db.db,
+	extra: config.db.extra,
 	entities: ['src/models/entities/*.ts'],
 	migrations: ['migration/*.ts'],
 	cli: {

From deb6485cc2ba87f0e672b643adc0053c75a44494 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 03:31:14 +0900
Subject: [PATCH 16/36] Update dependency :rocket:

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7dd6e3642b..8f24865827 100644
--- a/package.json
+++ b/package.json
@@ -253,7 +253,7 @@
 		"vuex": "3.1.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.5",
-		"webpack": "4.32.0",
+		"webpack": "4.32.2",
 		"webpack-cli": "3.3.2",
 		"websocket": "1.0.28",
 		"ws": "7.0.0",

From 2270fbf3ee53dcc909f9b87f7d88348c08afdfc2 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 03:46:20 +0900
Subject: [PATCH 17/36] :art:

---
 src/client/app/common/views/pages/page/page.text.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/client/app/common/views/pages/page/page.text.vue b/src/client/app/common/views/pages/page/page.text.vue
index eadc6f0aed..ca2565c8d4 100644
--- a/src/client/app/common/views/pages/page/page.text.vue
+++ b/src/client/app/common/views/pages/page/page.text.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="">
+<div class="mrdgzndn">
 	<mfm :text="text" :is-note="false" :i="$store.state.i" :key="text"/>
 </div>
 </template>
@@ -32,4 +32,10 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
+.mrdgzndn
+	&:not(:first-child)
+		margin-top 0.5em
+
+	&:not(:last-child)
+		margin-bottom 0.5em
 </style>

From 50251955cdeb5fbb8ff279bbcbea68d2bf606c7f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 03:57:03 +0900
Subject: [PATCH 18/36] Improve usability

---
 src/client/app/common/views/components/dialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/common/views/components/dialog.vue b/src/client/app/common/views/components/dialog.vue
index 9f38031d62..a577da5a21 100644
--- a/src/client/app/common/views/components/dialog.vue
+++ b/src/client/app/common/views/components/dialog.vue
@@ -98,7 +98,7 @@ export default Vue.extend({
 		return {
 			inputValue: this.input && this.input.default ? this.input.default : null,
 			userInputValue: null,
-			selectedValue: null,
+			selectedValue: this.select ? this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
 			faTimesCircle, faQuestionCircle
 		};
 	},

From bcdab799d0dc4d9b0ad7ae8e2fb438fe84ae180c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 04:17:14 +0900
Subject: [PATCH 19/36] :art:

---
 .../app/mobile/views/components/notification.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue
index 62df76cba5..9dae95c9b1 100644
--- a/src/client/app/mobile/views/components/notification.vue
+++ b/src/client/app/mobile/views/components/notification.vue
@@ -5,7 +5,7 @@
 		<div>
 			<header>
 				<mk-reaction-icon :reaction="notification.reaction"/>
-				<router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
+				<router-link class="name" :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
@@ -21,7 +21,7 @@
 		<div>
 			<header>
 				<fa icon="retweet"/>
-				<router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
+				<router-link class="name" :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
@@ -37,7 +37,7 @@
 		<div>
 			<header>
 				<fa icon="user-plus"/>
-				<router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
+				<router-link class="name" :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
 		</div>
@@ -48,7 +48,7 @@
 		<div>
 			<header>
 				<fa icon="user-clock"/>
-				<router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
+				<router-link class="name" :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
 		</div>
@@ -59,7 +59,7 @@
 		<div>
 			<header>
 				<fa icon="chart-pie"/>
-				<router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
+				<router-link class="name" :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
@@ -130,6 +130,12 @@ export default Vue.extend({
 				[data-icon], .mk-reaction-icon
 					margin-right 4px
 
+				> .name
+					text-overflow ellipsis
+					white-space nowrap
+					min-width 0
+					overflow hidden
+
 				> .mk-time
 					margin-left auto
 					color var(--noteHeaderInfo)

From e6f78a73ababd98642c12887881db61c714b4171 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 24 May 2019 04:25:57 +0900
Subject: [PATCH 20/36] i18n: reaction-picker.vue (#4971)

---
 locales/ja-JP.yml                                          | 1 +
 src/client/app/common/views/components/reaction-picker.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 48c4c36828..9153655f31 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -591,6 +591,7 @@ common/views/components/poll-editor.vue:
 
 common/views/components/reaction-picker.vue:
   choose-reaction: "リアクションを選択"
+  input-reaction-placeholder: "または絵文字を入力"
 
 common/views/components/emoji-picker.vue:
   custom-emoji: "カスタム絵文字"
diff --git a/src/client/app/common/views/components/reaction-picker.vue b/src/client/app/common/views/components/reaction-picker.vue
index 461e7c9090..970d430069 100644
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@@ -16,7 +16,7 @@
 			<button @click="react('pudding')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="10" :title="$t('@.reactions.pudding')" v-particle><mk-reaction-icon reaction="pudding"/></button>
 		</div>
 		<div v-if="enableEmojiReaction" class="text">
-			<input v-model="text" placeholder="または絵文字を入力" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }">
+			<input v-model="text" :placeholder="$t('input-reaction-placeholder')" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }">
 		</div>
 	</div>
 </div>

From 03136caac4b4f93e60d00c9e16ecbf13e405c367 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 04:57:04 +0900
Subject: [PATCH 21/36] Update instance.vue

---
 src/client/app/admin/views/instance.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue
index c4d445fbb8..588b24f6b5 100644
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -9,11 +9,11 @@
 			<ui-input v-model="iconUrl"><template #icon><fa icon="link"/></template>{{ $t('icon-url') }}</ui-input>
 			<ui-input v-model="mascotImageUrl"><template #icon><fa icon="link"/></template>{{ $t('logo-url') }}</ui-input>
 			<ui-input v-model="bannerUrl"><template #icon><fa icon="link"/></template>{{ $t('banner-url') }}</ui-input>
-			<ui-input v-model="errorImageUrl"><template #icon><fa icon="link"/></template>{{ $t('error-image-url') }}</ui-input>
 			<ui-input v-model="ToSUrl"><template #icon><fa icon="link"/></template>{{ $t('tos-url') }}</ui-input>
-			<ui-input v-model="languages"><template #icon><fa icon="language"/></template>{{ $t('languages') }}<template #desc>{{ $t('languages-desc') }}</template></ui-input>
 			<details>
 				<summary>{{ $t('advanced-config') }}</summary>
+				<ui-input v-model="errorImageUrl"><template #icon><fa icon="link"/></template>{{ $t('error-image-url') }}</ui-input>
+				<ui-input v-model="languages"><template #icon><fa icon="language"/></template>{{ $t('languages') }}<template #desc>{{ $t('languages-desc') }}</template></ui-input>
 				<ui-input v-model="repositoryUrl"><template #icon><fa icon="link"/></template>{{ $t('repository-url') }}</ui-input>
 				<ui-input v-model="feedbackUrl"><template #icon><fa icon="link"/></template>{{ $t('feedback-url') }}</ui-input>
 			</details>

From 5a4f6b4ada3df031b1b17d7c2aaf146b515f5695 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 18:11:12 +0900
Subject: [PATCH 22/36] Update page-editor.vue

---
 .../app/common/views/components/page-editor/page-editor.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/common/views/components/page-editor/page-editor.vue b/src/client/app/common/views/components/page-editor/page-editor.vue
index a3f69ea5c3..6f4cf9b6b5 100644
--- a/src/client/app/common/views/components/page-editor/page-editor.vue
+++ b/src/client/app/common/views/components/page-editor/page-editor.vue
@@ -11,7 +11,7 @@
 		</header>
 
 		<section>
-			<a class="view" v-if="pageId" :href="`/@${ author.username }/pages/${ currentName }`" target="_blank"><fa :icon="faExternalLinkSquareAlt"/> {{ $t('view-page') }}</a>
+			<a class="view" v-if="pageId" :href="`/@${ author.username }/pages/${ currentName }`"><fa :icon="faExternalLinkSquareAlt"/> {{ $t('view-page') }}</a>
 
 			<ui-input v-model="title">
 				<span>{{ $t('title') }}</span>

From 358bb0fc0641e43d3a7452614f5ef43c19c4d2e6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 18:11:33 +0900
Subject: [PATCH 23/36] =?UTF-8?q?Misskey=20Pages=20=E3=81=A7URL=E3=83=97?=
 =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/common/views/pages/page/page.text.vue | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/client/app/common/views/pages/page/page.text.vue b/src/client/app/common/views/pages/page/page.text.vue
index ca2565c8d4..326fd39050 100644
--- a/src/client/app/common/views/pages/page/page.text.vue
+++ b/src/client/app/common/views/pages/page/page.text.vue
@@ -1,11 +1,15 @@
 <template>
 <div class="mrdgzndn">
 	<mfm :text="text" :is-note="false" :i="$store.state.i" :key="text"/>
+
+	<mk-url-preview v-for="url in urls" :url="url" :key="url" class="url"/>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
+import { parse } from '../../../../../../mfm/parse';
+import { unique } from '../../../../../../prelude/array';
 
 export default Vue.extend({
 	props: {
@@ -23,6 +27,20 @@ export default Vue.extend({
 		};
 	},
 
+	computed: {
+		urls(): string[] {
+			if (this.text) {
+				const ast = parse(this.text);
+				// TODO: 再帰的にURL要素がないか調べる
+				return unique(ast
+					.filter(t => ((t.node.type == 'url' || t.node.type == 'link') && t.node.props.url && !t.node.props.silent))
+					.map(t => t.node.props.url));
+			} else {
+				return [];
+			}
+		}
+	},
+
 	created() {
 		this.$watch('script.vars', () => {
 			this.text = this.script.interpolate(this.value.text);
@@ -38,4 +56,7 @@ export default Vue.extend({
 
 	&:not(:last-child)
 		margin-bottom 0.5em
+
+	> .url
+		margin 0.5em 0
 </style>

From 36c2d0082f7c54d9fb99069aa60b8a8d67630ad3 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 19:19:43 +0900
Subject: [PATCH 24/36] =?UTF-8?q?MisskeyPages=E3=82=92=E3=83=9B=E3=83=BC?=
 =?UTF-8?q?=E3=83=A0UI=E3=81=AB=E7=B5=B1=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/views/components/mfm.ts |  6 +-
 .../common/views/components/url-preview.vue   | 11 +--
 .../app/common/views/components/url.vue       | 12 ++--
 .../page-editor/els/page-editor.el.button.vue |  0
 .../els/page-editor.el.counter.vue            |  0
 .../page-editor/els/page-editor.el.if.vue     |  0
 .../page-editor/els/page-editor.el.image.vue  |  2 +-
 .../els/page-editor.el.number-input.vue       |  0
 .../page-editor/els/page-editor.el.post.vue   |  0
 .../els/page-editor.el.section.vue            |  0
 .../page-editor/els/page-editor.el.switch.vue |  0
 .../els/page-editor.el.text-input.vue         |  0
 .../page-editor/els/page-editor.el.text.vue   |  0
 .../els/page-editor.el.textarea-input.vue     |  0
 .../els/page-editor.el.textarea.vue           |  0
 .../page-editor/page-editor.blocks.vue        |  0
 .../page-editor/page-editor.container.vue     |  0
 .../page-editor/page-editor.script-block.vue  |  0
 .../page-editor/page-editor.vue               | 33 ++++++---
 .../app/common/views/pages/page/page.vue      | 10 +--
 src/client/app/desktop/script.ts              |  8 +--
 .../app/desktop/views/pages/page-editor.vue   | 67 -------------------
 src/client/app/desktop/views/pages/page.vue   | 36 ----------
 src/client/app/mobile/script.ts               |  8 +--
 .../app/mobile/views/pages/page-editor.vue    | 67 -------------------
 src/client/app/mobile/views/pages/page.vue    | 39 -----------
 26 files changed, 58 insertions(+), 241 deletions(-)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.button.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.counter.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.if.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.image.vue (95%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.number-input.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.post.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.section.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.switch.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.text-input.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.text.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.textarea-input.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/els/page-editor.el.textarea.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/page-editor.blocks.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/page-editor.container.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/page-editor.script-block.vue (100%)
 rename src/client/app/common/views/{components => pages}/page-editor/page-editor.vue (94%)
 delete mode 100644 src/client/app/desktop/views/pages/page-editor.vue
 delete mode 100644 src/client/app/desktop/views/pages/page.vue
 delete mode 100644 src/client/app/mobile/views/pages/page-editor.vue
 delete mode 100644 src/client/app/mobile/views/pages/page.vue

diff --git a/src/client/app/common/views/components/mfm.ts b/src/client/app/common/views/components/mfm.ts
index 9459172881..7de29b2aad 100644
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@@ -8,7 +8,7 @@ import { concat, sum } from '../../../../../prelude/array';
 import MkFormula from './formula.vue';
 import MkCode from './code.vue';
 import MkGoogle from './google.vue';
-import { host } from '../../../config';
+import { host, url } from '../../../config';
 import { preorderF, countNodesF } from '../../../../../prelude/tree';
 
 function sumTextsLength(ts: MfmForest): number {
@@ -175,7 +175,9 @@ export default Vue.component('misskey-flavored-markdown', {
 						props: {
 							url: token.node.props.url,
 							rel: 'nofollow noopener',
-							target: '_blank'
+							...(token.node.props.url.startsWith(url) ? {} : {
+								target: '_blank'
+							})
 						},
 						attrs: {
 							style: 'color:var(--mfmUrl);'
diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue
index 9ca4497ad8..6e0d73eef5 100644
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@@ -9,7 +9,7 @@
 	</blockquote>
 </div>
 <div v-else class="mk-url-preview">
-	<a :class="{ mini: narrow, compact }" :href="url" rel="nofollow noopener" target="_blank" :title="url" v-if="!fetching">
+	<component :is="self ? 'router-link' : 'a'" :class="{ mini: narrow, compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="self ? null : '_blank'" :title="url" v-if="!fetching">
 		<div class="thumbnail" v-if="thumbnail" :style="`background-image: url('${thumbnail}')`">
 			<button v-if="!playerEnabled && player.url" @click.prevent="playerEnabled = true" :title="$t('enable-player')"><fa :icon="['far', 'play-circle']"/></button>
 		</div>
@@ -23,17 +23,18 @@
 				<p :title="sitename">{{ sitename }}</p>
 			</footer>
 		</article>
-	</a>
+	</component>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { url as misskeyUrl } from '../../../config';
+import { url as local } from '../../../config';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/url-preview.vue'),
+
 	props: {
 		url: {
 			type: String,
@@ -74,7 +75,9 @@ export default Vue.extend({
 			},
 			tweetUrl: null,
 			playerEnabled: false,
-			misskeyUrl,
+			local,
+			self: this.url.startsWith(local),
+			attr: this.url.startsWith(local) ? 'to' : 'href'
 		};
 	},
 
diff --git a/src/client/app/common/views/components/url.vue b/src/client/app/common/views/components/url.vue
index faf439814d..840535514d 100644
--- a/src/client/app/common/views/components/url.vue
+++ b/src/client/app/common/views/components/url.vue
@@ -1,29 +1,33 @@
 <template>
-<a class="mk-url" :href="url" :rel="rel" :target="target">
+<component :is="self ? 'router-link' : 'a'" class="mk-url" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target">
 	<span class="schema">{{ schema }}//</span>
 	<span class="hostname">{{ hostname }}</span>
 	<span class="port" v-if="port != ''">:{{ port }}</span>
 	<span class="pathname" v-if="pathname != ''">{{ pathname }}</span>
 	<span class="query">{{ query }}</span>
 	<span class="hash">{{ hash }}</span>
-	<fa icon="external-link-square-alt"/>
-</a>
+	<fa icon="external-link-square-alt" v-if="!self"/>
+</component>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
 import { toUnicode as decodePunycode } from 'punycode';
+import { url as local } from '../../../config';
 
 export default Vue.extend({
 	props: ['url', 'rel', 'target'],
 	data() {
 		return {
+			local,
 			schema: null,
 			hostname: null,
 			port: null,
 			pathname: null,
 			query: null,
-			hash: null
+			hash: null,
+			self: this.url.startsWith(local),
+			attr: this.url.startsWith(local) ? 'to' : 'href'
 		};
 	},
 	created() {
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.button.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.button.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.button.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.button.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.counter.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.counter.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.counter.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.counter.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.if.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.if.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.if.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.if.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.image.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.image.vue
similarity index 95%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.image.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.image.vue
index 98ec39a512..e2e72b04c2 100644
--- a/src/client/app/common/views/components/page-editor/els/page-editor.el.image.vue
+++ b/src/client/app/common/views/pages/page-editor/els/page-editor.el.image.vue
@@ -19,7 +19,7 @@ import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { faImage, faFolderOpen } from '@fortawesome/free-regular-svg-icons';
 import i18n from '../../../../../i18n';
 import XContainer from '../page-editor.container.vue';
-import XFileThumbnail from '../../drive-file-thumbnail.vue';
+import XFileThumbnail from '../../../components/drive-file-thumbnail.vue';
 
 export default Vue.extend({
 	i18n: i18n('pages'),
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.number-input.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.number-input.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.number-input.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.number-input.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.post.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.post.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.post.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.post.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.section.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.section.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.section.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.section.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.switch.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.switch.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.switch.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.switch.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.text-input.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.text-input.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.text-input.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.text-input.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.text.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.text.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.text.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.text.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.textarea-input.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.textarea-input.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.textarea-input.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.textarea-input.vue
diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.textarea.vue b/src/client/app/common/views/pages/page-editor/els/page-editor.el.textarea.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/els/page-editor.el.textarea.vue
rename to src/client/app/common/views/pages/page-editor/els/page-editor.el.textarea.vue
diff --git a/src/client/app/common/views/components/page-editor/page-editor.blocks.vue b/src/client/app/common/views/pages/page-editor/page-editor.blocks.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/page-editor.blocks.vue
rename to src/client/app/common/views/pages/page-editor/page-editor.blocks.vue
diff --git a/src/client/app/common/views/components/page-editor/page-editor.container.vue b/src/client/app/common/views/pages/page-editor/page-editor.container.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/page-editor.container.vue
rename to src/client/app/common/views/pages/page-editor/page-editor.container.vue
diff --git a/src/client/app/common/views/components/page-editor/page-editor.script-block.vue b/src/client/app/common/views/pages/page-editor/page-editor.script-block.vue
similarity index 100%
rename from src/client/app/common/views/components/page-editor/page-editor.script-block.vue
rename to src/client/app/common/views/pages/page-editor/page-editor.script-block.vue
diff --git a/src/client/app/common/views/components/page-editor/page-editor.vue b/src/client/app/common/views/pages/page-editor/page-editor.vue
similarity index 94%
rename from src/client/app/common/views/components/page-editor/page-editor.vue
rename to src/client/app/common/views/pages/page-editor/page-editor.vue
index 6f4cf9b6b5..ebe0f4688d 100644
--- a/src/client/app/common/views/components/page-editor/page-editor.vue
+++ b/src/client/app/common/views/pages/page-editor/page-editor.vue
@@ -11,7 +11,7 @@
 		</header>
 
 		<section>
-			<a class="view" v-if="pageId" :href="`/@${ author.username }/pages/${ currentName }`"><fa :icon="faExternalLinkSquareAlt"/> {{ $t('view-page') }}</a>
+			<router-link class="view" v-if="pageId" :to="`/@${ author.username }/pages/${ currentName }`"><fa :icon="faExternalLinkSquareAlt"/> {{ $t('view-page') }}</router-link>
 
 			<ui-input v-model="title">
 				<span>{{ $t('title') }}</span>
@@ -111,20 +111,25 @@ export default Vue.extend({
 	},
 
 	props: {
-		page: {
-			type: Object,
+		initPageId: {
+			type: String,
 			required: false
 		},
-		readonly: {
-			type: Boolean,
-			required: false,
-			default: false
+		initPageName: {
+			type: String,
+			required: false
+		},
+		initUser: {
+			type: String,
+			required: false
 		},
 	},
 
 	data() {
 		return {
 			author: this.$store.state.i,
+			readonly: false,
+			page: null,
 			pageId: null,
 			currentName: null,
 			title: '',
@@ -156,7 +161,7 @@ export default Vue.extend({
 		},
 	},
 
-	created() {
+	async created() {
 		this.aiScript = new ASTypeChecker();
 
 		this.$watch('variables', () => {
@@ -167,6 +172,18 @@ export default Vue.extend({
 			this.aiScript.pageVars = collectPageVars(this.content);
 		}, { deep: true });
 
+		if (this.initPageId) {
+			this.page = await this.$root.api('pages/show', {
+				pageId: this.initPageId,
+			});
+		} else if (this.initPageName && this.initUser) {
+			this.page = await this.$root.api('pages/show', {
+				name: this.initPageName,
+				username: this.initUser,
+			});
+			this.readonly = true;
+		}
+
 		if (this.page) {
 			this.author = this.page.user;
 			this.pageId = this.page.id;
diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
index d3fb948c85..649bc1e17d 100644
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@@ -148,8 +148,8 @@ export default Vue.extend({
 		> .title
 			z-index 1
 			margin 0
-			padding 32px 64px
-			font-size 24px
+			padding 16px 32px
+			font-size 20px
 			font-weight bold
 			color var(--text)
 			box-shadow 0 var(--lineWidth) rgba(#000, 0.07)
@@ -160,8 +160,8 @@ export default Vue.extend({
 
 	> div
 		color var(--text)
-		padding 48px 64px
-		font-size 18px
+		padding 24px 32px
+		font-size 16px
 
 		@media (max-width 600px)
 			padding 24px 32px
@@ -169,7 +169,7 @@ export default Vue.extend({
 
 	> footer
 		color var(--text)
-		padding 0 64px 38px 64px
+		padding 0 32px 28px 32px
 
 		@media (max-width 600px)
 			padding 0 32px 28px 32px
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index b283ab2075..1ec7f1cfbf 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -168,11 +168,11 @@ init(async (launch, os) => {
 					{ path: '/i/groups', component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) },
 					{ path: '/i/groups/:groupId', props: true, component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default) },
 					{ path: '/i/follow-requests', component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) },
+					{ path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) },
+					{ path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) },
+					{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
+					{ path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 				]},
-			{ path: '/@:user/pages/:page', props: true, component: () => import('./views/pages/page.vue').then(m => m.default) },
-			{ path: '/@:user/pages/:pageName/view-source', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
-			{ path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
-			{ path: '/i/pages/edit/:pageId', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
 			{ path: '/i/messaging/group/:group', component: MkMessagingRoom },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
 			{ path: '/i/drive', component: MkDrive },
diff --git a/src/client/app/desktop/views/pages/page-editor.vue b/src/client/app/desktop/views/pages/page-editor.vue
deleted file mode 100644
index 35b4008e4f..0000000000
--- a/src/client/app/desktop/views/pages/page-editor.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-<mk-ui>
-	<main>
-		<x-page-editor v-if="page !== undefined" :page="page" :readonly="readonly"/>
-	</main>
-</mk-ui>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	components: {
-		XPageEditor: () => import('../../../common/views/components/page-editor/page-editor.vue').then(m => m.default)
-	},
-
-	props: {
-		pageId: {
-			type: String,
-			required: false
-		},
-		pageName: {
-			type: String,
-			required: false
-		},
-		user: {
-			type: String,
-			required: false
-		}
-	},
-
-	data() {
-		return {
-			page: undefined,
-			readonly: false
-		};
-	},
-
-	created() {
-		if (this.pageId) {
-			this.$root.api('pages/show', {
-				pageId: this.pageId,
-			}).then(page => {
-				this.page = page;
-			});
-		} else if (this.pageName && this.user) {
-			this.$root.api('pages/show', {
-				name: this.pageName,
-				username: this.user,
-			}).then(page => {
-				this.readonly = true;
-				this.page = page;
-			});
-		} else {
-			this.page = null;
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-main
-	margin 0 auto
-	padding 16px
-	max-width 900px
-
-</style>
diff --git a/src/client/app/desktop/views/pages/page.vue b/src/client/app/desktop/views/pages/page.vue
deleted file mode 100644
index 1ddff08c76..0000000000
--- a/src/client/app/desktop/views/pages/page.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-<mk-ui>
-	<main>
-		<x-page :page-name="page" :username="user"/>
-	</main>
-</mk-ui>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	components: {
-		XPage: () => import('../../../common/views/pages/page/page.vue').then(m => m.default)
-	},
-
-	props: {
-		page: {
-			type: String,
-			required: true
-		},
-		user: {
-			type: String,
-			required: true
-		},
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-main
-	margin 0 auto
-	padding 16px
-	max-width 950px
-
-</style>
diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts
index 106e843ca8..d04662cc1f 100644
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -149,8 +149,8 @@ init((launch, os) => {
 			{ path: '/i/drive', name: 'drive', component: MkDrive },
 			{ path: '/i/drive/folder/:folder', component: MkDrive },
 			{ path: '/i/drive/file/:file', component: MkDrive },
-			{ path: '/i/pages/new', component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
-			{ path: '/i/pages/edit/:pageId', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
+			{ path: '/i/pages/new', component: UI, props: route => ({ component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) }) },
+			{ path: '/i/pages/edit/:pageId', component: UI, props: route => ({ component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), initPageId: route.params.pageId }) },
 			{ path: '/selectdrive', component: MkSelectDrive },
 			{ path: '/search', component: MkSearch },
 			{ path: '/tags/:tag', component: MkTag },
@@ -163,8 +163,8 @@ init((launch, os) => {
 				{ path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) },
 				{ path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) },
 			]},
-			{ path: '/@:user/pages/:page', props: true, component: () => import('./views/pages/page.vue').then(m => m.default) },
-			{ path: '/@:user/pages/:pageName/view-source', props: true, component: () => import('./views/pages/page-editor.vue').then(m => m.default) },
+			{ path: '/@:user/pages/:page', component: UI, props: route => ({ component: () => import('../common/views/pages/page/page.vue').then(m => m.default), pageName: route.params.page, username: route.params.user }) },
+			{ path: '/@:user/pages/:pageName/view-source', component: UI, props: route => ({ component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), initUser: route.params.user, initPageName: route.params.pageName }) },
 			{ path: '/notes/:note', component: MkNote },
 			{ path: '/authorize-follow', component: MkFollow },
 			{ path: '*', component: MkNotFound }
diff --git a/src/client/app/mobile/views/pages/page-editor.vue b/src/client/app/mobile/views/pages/page-editor.vue
deleted file mode 100644
index 0b04f25802..0000000000
--- a/src/client/app/mobile/views/pages/page-editor.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-<mk-ui>
-	<main>
-		<x-page-editor v-if="page !== undefined" :page="page" :readonly="readonly"/>
-	</main>
-</mk-ui>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	components: {
-		XPageEditor: () => import('../../../common/views/components/page-editor/page-editor.vue').then(m => m.default)
-	},
-
-	props: {
-		pageId: {
-			type: String,
-			required: false
-		},
-		pageName: {
-			type: String,
-			required: false
-		},
-		user: {
-			type: String,
-			required: false
-		}
-	},
-
-	data() {
-		return {
-			page: undefined,
-			readonly: false
-		};
-	},
-
-	created() {
-		if (this.pageId) {
-			this.$root.api('pages/show', {
-				pageId: this.pageId,
-			}).then(page => {
-				this.page = page;
-			});
-		} else if (this.pageName && this.user) {
-			this.$root.api('pages/show', {
-				name: this.pageName,
-				username: this.user,
-			}).then(page => {
-				this.readonly = true;
-				this.page = page;
-			});
-		} else {
-			this.page = null;
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-main
-	margin 0 auto
-	padding 16px
-	max-width 1000px
-
-</style>
diff --git a/src/client/app/mobile/views/pages/page.vue b/src/client/app/mobile/views/pages/page.vue
deleted file mode 100644
index f494abffd7..0000000000
--- a/src/client/app/mobile/views/pages/page.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<template>
-<mk-ui>
-	<main>
-		<x-page :page-name="page" :username="user"/>
-	</main>
-</mk-ui>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	components: {
-		XPage: () => import('../../../common/views/pages/page/page.vue').then(m => m.default)
-	},
-
-	props: {
-		page: {
-			type: String,
-			required: true
-		},
-		user: {
-			type: String,
-			required: true
-		},
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-main
-	margin 0 auto
-	padding 16px
-	max-width 1000px
-
-	@media (min-width 600px)
-		padding 32px
-
-</style>

From c6531e8609cb68b5b9eb43ceed9af2983267f773 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Fri, 24 May 2019 19:31:40 +0900
Subject: [PATCH 25/36] Improve localization description (#4976)

* Improve localization description

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md
---
 CONTRIBUTING.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b01e5e6dd8..d93fc50ec6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,11 @@ Before creating a new issue, please search existing issues to avoid duplication.
 If you find the existing issue, please add your reaction or comment to the issue.
 
 ## Localization (l10n)
-Please use [Crowdin](https://crowdin.com/project/misskey) for localization.
+Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
+You can improve our translations with your Crowdin account.
+Changes you make in Crowdin will be merged into develop branch.
+
+If you can't find the language you want to contribute with, please open an issue.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 

From 312ba501a324f97211b3c273979ae11ebc03c3f7 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 19:33:58 +0900
Subject: [PATCH 26/36] Add deck fallback

---
 src/client/app/desktop/script.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 1ec7f1cfbf..ce0b96e0ac 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -173,6 +173,10 @@ init(async (launch, os) => {
 					{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
 					{ path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 				]},
+			{ path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) },
+			{ path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) },
+			{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
+			{ path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 			{ path: '/i/messaging/group/:group', component: MkMessagingRoom },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
 			{ path: '/i/drive', component: MkDrive },

From 3ea7a49c1c832bba12ba0591e0cc6cffbd2fc4db Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 24 May 2019 19:36:35 +0900
Subject: [PATCH 27/36] Show page title

---
 src/client/app/common/views/pages/page/page.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
index 649bc1e17d..329046302b 100644
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@@ -25,7 +25,7 @@
 import Vue from 'vue';
 import i18n from '../../../../i18n';
 import { faHeart as faHeartS } from '@fortawesome/free-solid-svg-icons';
-import { faHeart } from '@fortawesome/free-regular-svg-icons';
+import { faHeart, faStickyNote } from '@fortawesome/free-regular-svg-icons';
 import XBlock from './page.block.vue';
 import { ASEvaluator } from '../../../../../../misc/aiscript/evaluator';
 import { collectPageVars } from '../../../scripts/collect-page-vars';
@@ -91,6 +91,10 @@ export default Vue.extend({
 			username: this.username,
 		}).then(page => {
 			this.page = page;
+			this.$emit('init', {
+				title: this.page.title,
+				icon: faStickyNote
+			});
 			const pageVars = this.getPageVars();
 			this.script = new Script(new ASEvaluator(this.page.variables, pageVars, {
 				randomSeed: Math.random(),

From 7e7f94d685b0158e1f5fb800dcbc9b863b6bd6bd Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Sat, 25 May 2019 08:35:16 +0900
Subject: [PATCH 28/36] Enable query result cache for meta / stats / hashtags
 trend (#4978)

---
 src/db/postgre.ts                          | 12 ++++++++++++
 src/server/api/endpoints/hashtags/trend.ts |  3 +++
 src/server/api/endpoints/meta.ts           |  2 +-
 src/server/api/endpoints/stats.ts          |  8 ++++----
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/db/postgre.ts b/src/db/postgre.ts
index 04893efe2c..8e2d585e99 100644
--- a/src/db/postgre.ts
+++ b/src/db/postgre.ts
@@ -96,6 +96,18 @@ export function initDb(justBorrow = false, sync = false, log = false) {
 		extra: config.db.extra,
 		synchronize: process.env.NODE_ENV === 'test' || sync,
 		dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
+		cache: {
+			type: 'redis',
+			options: {
+				host: config.redis.host,
+				port: config.redis.port,
+				options:{
+					auth_pass: config.redis.pass,
+					prefix: config.redis.prefix,
+					db: config.redis.db || 0
+				}
+			}
+		},
 		logging: log,
 		logger: log ? new MyCustomLogger() : undefined,
 		entities: [
diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts
index 05d571851e..53a3514718 100644
--- a/src/server/api/endpoints/hashtags/trend.ts
+++ b/src/server/api/endpoints/hashtags/trend.ts
@@ -59,6 +59,7 @@ export default define(meta, async () => {
 		.where(`note.createdAt > :date`, { date: new Date(Date.now() - rangeA) })
 		.andWhere(`note.tags != '{}'`)
 		.select(['note.tags', 'note.userId'])
+		.cache(60000) // 1 min
 		.getMany();
 
 	if (tagNotes.length === 0) {
@@ -108,6 +109,7 @@ export default define(meta, async () => {
 			.where(':tag = ANY(note.tags)', { tag: tag })
 			.andWhere('note.createdAt < :lt', { lt: new Date(Date.now() - (interval * i)) })
 			.andWhere('note.createdAt > :gt', { gt: new Date(Date.now() - (interval * (i + 1))) })
+			.cache(60000) // 1 min
 			.getRawOne()
 			.then(x => parseInt(x.count, 10))
 		)));
@@ -119,6 +121,7 @@ export default define(meta, async () => {
 		.select('count(distinct note.userId)')
 		.where(':tag = ANY(note.tags)', { tag: tag })
 		.andWhere('note.createdAt > :gt', { gt: new Date(Date.now() - (interval * range)) })
+		.cache(60000) // 1 min
 		.getRawOne()
 		.then(x => parseInt(x.count, 10))
 	));
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 4f418c63c1..d18543f56a 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -94,7 +94,7 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	const instance = await fetchMeta(true);
 
-	const emojis = await Emojis.find({ host: null });
+	const emojis = await Emojis.find({ where: { host: null }, cache: 3600000 }); // 1 hour
 
 	const response: any = {
 		maintainerName: instance.maintainerName,
diff --git a/src/server/api/endpoints/stats.ts b/src/server/api/endpoints/stats.ts
index f85109b4b4..4dca62445f 100644
--- a/src/server/api/endpoints/stats.ts
+++ b/src/server/api/endpoints/stats.ts
@@ -57,10 +57,10 @@ export default define(meta, async () => {
 		driveUsageLocal,
 		driveUsageRemote
 	] = await Promise.all([
-		Notes.count(),
-		Notes.count({ userHost: null }),
-		Users.count(),
-		Users.count({ host: null }),
+		Notes.count({ cache: 3600000 }), // 1 hour
+		Notes.count({ where: { userHost: null }, cache: 3600000 }),
+		Users.count({ cache: 3600000 }),
+		Users.count({ where: { host: null }, cache: 3600000 }),
 		federationChart.getChart('hour', 1).then(chart => chart.instance.total[0]),
 		driveChart.getChart('hour', 1).then(chart => chart.local.totalSize[0]),
 		driveChart.getChart('hour', 1).then(chart => chart.remote.totalSize[0]),

From fc7268fd129b41a86d39f08c1552578d3ee2a6dc Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 May 2019 08:49:58 +0900
Subject: [PATCH 29/36] :art:

---
 src/client/app/common/views/pages/page/page.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
index 329046302b..7938d706b9 100644
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@@ -162,6 +162,10 @@ export default Vue.extend({
 				padding 16px 32px
 				font-size 20px
 
+			@media (max-width 400px)
+				padding 10px 20px
+				font-size 16px
+
 	> div
 		color var(--text)
 		padding 24px 32px
@@ -171,6 +175,10 @@ export default Vue.extend({
 			padding 24px 32px
 			font-size 16px
 
+		@media (max-width 400px)
+			padding 20px 20px
+			font-size 15px
+
 	> footer
 		color var(--text)
 		padding 0 32px 28px 32px
@@ -178,12 +186,16 @@ export default Vue.extend({
 		@media (max-width 600px)
 			padding 0 32px 28px 32px
 
+		@media (max-width 400px)
+			padding 0 20px 20px 20px
+			font-size 14px
+
 		> small
 			display block
 			opacity 0.5
 
 		> a
-			font-size 14px
+			font-size 90%
 
 		> a + a
 			margin-left 8px

From 0af3e15e8268b6a5a368aeaff31a442d1c34e3e1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 May 2019 09:04:16 +0900
Subject: [PATCH 30/36] :art:

---
 src/client/app/common/views/components/url.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/client/app/common/views/components/url.vue b/src/client/app/common/views/components/url.vue
index 840535514d..1c437d92b4 100644
--- a/src/client/app/common/views/components/url.vue
+++ b/src/client/app/common/views/components/url.vue
@@ -1,8 +1,10 @@
 <template>
 <component :is="self ? 'router-link' : 'a'" class="mk-url" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target">
-	<span class="schema">{{ schema }}//</span>
-	<span class="hostname">{{ hostname }}</span>
-	<span class="port" v-if="port != ''">:{{ port }}</span>
+	<template v-if="!self">
+		<span class="schema">{{ schema }}//</span>
+		<span class="hostname">{{ hostname }}</span>
+		<span class="port" v-if="port != ''">:{{ port }}</span>
+	</template>
 	<span class="pathname" v-if="pathname != ''">{{ pathname }}</span>
 	<span class="query">{{ query }}</span>
 	<span class="hash">{{ hash }}</span>

From 7f54c8fa2a7265dc6c5790daf96e9056604a4c5c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 May 2019 09:05:14 +0900
Subject: [PATCH 31/36] :art:

---
 src/client/app/common/views/components/url.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/common/views/components/url.vue b/src/client/app/common/views/components/url.vue
index 1c437d92b4..2829812f99 100644
--- a/src/client/app/common/views/components/url.vue
+++ b/src/client/app/common/views/components/url.vue
@@ -5,7 +5,7 @@
 		<span class="hostname">{{ hostname }}</span>
 		<span class="port" v-if="port != ''">:{{ port }}</span>
 	</template>
-	<span class="pathname" v-if="pathname != ''">{{ pathname }}</span>
+	<span class="pathname" v-if="pathname != ''">{{ self ? pathname.substr(1) : pathname }}</span>
 	<span class="query">{{ query }}</span>
 	<span class="hash">{{ hash }}</span>
 	<fa icon="external-link-square-alt" v-if="!self"/>

From 114803a86a862504fbe0d48f08724db05165c174 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 May 2019 09:07:50 +0900
Subject: [PATCH 32/36] Fix #4972

---
 src/client/app/common/views/components/messaging.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue
index cdd35ee8ab..b21104bf9a 100644
--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@@ -46,7 +46,7 @@
 			</div>
 		</a>
 	</div>
-	<p class="no-history" v-if="!fetching && (messages.length == 0 && groupMessages.length == 0)">{{ $t('no-history') }}</p>
+	<p class="no-history" v-if="!fetching && messages.length == 0">{{ $t('no-history') }}</p>
 	<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 	<ui-margin>
 		<ui-button @click="startUser()"><fa :icon="faUser"/> {{ $t('start-with-user') }}</ui-button>

From 69a916d5069204ebb6e479a099744ce49aed10a2 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 25 May 2019 09:10:51 +0900
Subject: [PATCH 33/36] =?UTF-8?q?Fix:=20Firefox=E3=81=A7=E3=83=88=E3=83=BC?=
 =?UTF-8?q?=E3=82=AF=E3=81=AE=E4=B8=8B=E3=81=8C=E9=9A=A0=E3=82=8C=E3=81=A6?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=86=20(#4974)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/views/components/messaging-room.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/client/app/common/views/components/messaging-room.vue b/src/client/app/common/views/components/messaging-room.vue
index 658dc93f64..d5fa4143a0 100644
--- a/src/client/app/common/views/components/messaging-room.vue
+++ b/src/client/app/common/views/components/messaging-room.vue
@@ -300,17 +300,13 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .mk-messaging-room
-	display flex
-	flex 1
-	flex-direction column
-	height 100%
 	background var(--messagingRoomBg)
 
 	> .body
 		width 100%
 		max-width 600px
 		margin 0 auto
-		flex 1
+		min-height calc(100% - 103px)
 
 		> .init,
 		> .empty

From efeebd2165127b084c2871651fb858ec5a5c6733 Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Sat, 25 May 2019 09:11:24 +0900
Subject: [PATCH 34/36] Better migration for UserProfile1556746559567 (#4969)

---
 migration/1556746559567-UserProfile.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/migration/1556746559567-UserProfile.ts b/migration/1556746559567-UserProfile.ts
index 719f8e1ae0..2dc7349cc1 100644
--- a/migration/1556746559567-UserProfile.ts
+++ b/migration/1556746559567-UserProfile.ts
@@ -3,21 +3,14 @@ import {MigrationInterface, QueryRunner} from "typeorm";
 export class UserProfile1556746559567 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" VARCHAR(64)`);
-        await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" VARCHAR(64)`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE VARCHAR(64) USING "githubId"::VARCHAR(64)`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE VARCHAR(64) USING "discordExpiresDate"::VARCHAR(64)`);
     }
 
     public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "githubId" INTEGER`);
-        await queryRunner.query(`UPDATE "user_profile" SET discord = FALSE`);
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "discordExpiresDate" INTEGER`);
+        await queryRunner.query(`UPDATE "user_profile" SET github = FALSE, discord = FALSE`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "githubId" TYPE INTEGER USING NULL`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "discordExpiresDate" TYPE INTEGER USING NULL`);
     }
 
 }

From 0dfc1fcf139c918c7fa01690e29cda3f9afd6df1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 25 May 2019 09:11:42 +0900
Subject: [PATCH 35/36] New Crowdin translations (#4955)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)
---
 locales/de-DE.yml | 198 +++++++++++++++++++++++++++++++++++++++++++++-
 locales/en-US.yml |  54 +++++++++++--
 locales/fr-FR.yml |  48 +++++++++--
 locales/ko-KR.yml |  29 ++++---
 locales/zh-CN.yml |   9 +++
 5 files changed, 309 insertions(+), 29 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index e9ea042450..1d5a99f169 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -10,26 +10,35 @@ common:
     about: "Misskey ist eine Quelloffene, <b>dezentralisierte microblogging Software</b>. Es bietet eine erweiterbare Benutzeroberfläche, verschiedenste Möglichkeiten auf Beiträge zu reagieren, kostenlosen Datenspeicher, und andere fortschrittliche Funktionen. Zusätzlich ist Misskey dazu in der Lage, sich mittels des Fediverse mit beliebig vielen anderen ActivityPub-kompatiblen Diensten zu verbinden. Wenn du zum Beispiel einen Betrag mit Misskey abschickst, wird dieser auch für Nutzer von Mastodon oder Pleroma sichtbar sein. So ähnlich wie eine Radioübertragung zwischen Planeten."
     features: "Funktionen"
     rich-contents: "Notizen"
+    rich-contents-desc: "Poste einfach deine Ideen, Interessen und alles, was du teilen möchtest. Gestalte deine Nachrichten, teile deine Lieblingsbilder, sende Dateien und Videos und erstelle Umfragen – das und mehr kann Misskey!"
     reaction: "Reaktionen"
+    reaction-desc: "Der einfachste Weg, deine Gefühle mit anderen zu teilen. Mit Misskey kannst du auf verschiedenste Arten auf Beiträge reagieren, statt nur zu „liken“."
     ui: "Benutzeroberfläche"
+    ui-desc: "Geschmäcker sind verschieden. Deswegen ist Misskeys Oberfläche hochanpassbar und modular. Mache die Startseite zu deiner Startseite, indem du das Layout deiner Timeline änderst und mit Widgets staffierst."
     drive: "Drive"
+    drive-desc: "Du willst ein hochgeladenes Foto nochmal posten? Deine Dateien benennen und in Ordnern sortieren? Misskeys Drive ist der beste Ort dafür. Damit wird das Teilen zum Kinderspiel!"
+    outro: "Probiere Misskey aus und entdecke Misskeys einzigartige Funktionen. Wenn dir diese Instanz nicht zusagt, nimm einfach eine andere. Dank Misskeys dezentralem System kannst du dich überall mit deinen Freunden verbinden. Also dann, GLHF!"
   adblock:
     detected: "Bitte deaktiviere den Werbeblocker."
+    warning: "<strong>Misskey hat keine Werbung.</strong> Allerdings können Werbeblocker für unerwartete Probleme und fehlende Funktionen sorgen."
   application-authorization: "Autorisierte Anwendungen"
   close: "Schließen"
+  do-not-copy-paste: "Bitte keinen Code einfügen. Ihr Account könnte gefährdet werden."
   load-more: "Mehr laden"
   enter-password: "Bitte Passwort eingeben"
   2fa: "Zwei-Faktor-Authentifizierung"
   customize-home: "Layout Anpassen"
-  featured-notes: "Hervorgehobene Beiträge"
+  featured-notes: "Beliebt"
   dark-mode: "Dunkler Modus"
   signin: "Einloggen"
   signup: "Registrieren"
   signout: "Ausloggen"
   reload-to-apply-the-setting: "Die Seite muss zum Übernehmen dieser Einstellung aktualisiert werden. Soll die Seite jetzt neu geladen werden?"
+  fetching-as-ap-object: "Hole Daten…"
   got-it: "Verstanden!"
   customization-tips:
     title: "Anpassung-Tipps"
+    paragraph: "<p>Du kannst deine Startseite anpassen, indem du Widgets hinzufügst und verschiebst.</p><p><strong>Klicke <strong>rechts</strong></strong> auf ein Widget, um dessen Aussehen zu verändern.</p><p>Um ein Widget zu löschen, klicke und ziehe es auf den <strong>Papierkorb</strong> am Kopfende der Seite.</p><p>Wenn du fertig bist, drücke auf den Beenden-Knopf oben rechts.</p>"
     gotit: "Verstanden!"
   notification:
     file-uploaded: "Datei hochgeladen!"
@@ -56,21 +65,32 @@ common:
   pages: "Seite"
   messaging: "Unterhaltungen"
   home: "Home"
-  deck: "Stapel"
+  deck: "Deck"
   timeline: "Zeitleiste"
   explore: "Entdecken"
   following: "Folgt"
   followers: "Folgende"
-  favorites: "Diesen Beitrag favorisieren"
+  favorites: "Favoriten"
   permissions:
     "read:account": "Accountinformationen anzeigen."
     "write:account": "Accountinformationen bearbeiten."
     "read:blocks": "Blöcke anzeigen"
+    "write:blocks": "Auf Sperrungen zugreifen"
     "read:drive": "Dateien anzeigen"
     "write:drive": "Dateien bearbeiten"
     "read:favorites": "Favoriten anzeigen"
+    "write:favorites": "Auf Favoriten zugreifen"
+    "read:following": "Follower-Daten lesen"
+    "write:following": "Folgestatus bearbeiten"
     "read:messaging": "Unterhaltung anzeigen"
     "write:messaging": "Unterhaltung bearbeiten"
+    "read:mutes": "Stummschaltungen lesen"
+    "write:mutes": "Stummschaltungen bearbeiten"
+    "write:notes": "Beiträge löschen und verfassen"
+    "read:notifications": "Benachrichtigungen lesen"
+    "write:notifications": "Benachrichtigungen bearbeiten"
+    "read:reactions": "Reaktionen sehen"
+    "write:reactions": "Reaktionen hinzufügen und bearbeiten"
     "write:votes": "Abstimmen"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Beiträge von Benutzern, denen du folgst, werden in der Zeitleiste angezeigt."
@@ -147,22 +167,116 @@ common:
     show-reversi-board-labels: "Zeige Reihen- und Spaltenbeschreibungen in Reversi an"
     use-avatar-reversi-stones: "Avatar als Stein in Reversi anzeigen"
     disable-animated-mfm: "Animierten Text in Beiträgen deaktivieren"
+    disable-showing-animated-images: "Animierte Grafiken deaktivieren"
+    suggest-recent-hashtags: "Beim Verfassen von Beiträgen letzte Hashtags anzeigen"
+    always-show-nsfw: "Sensible Inhalte (NSFW) immer anzeigen"
+    always-mark-nsfw: "Meine Anhänge immer als NSFW markieren"
+    show-full-acct: "Servername bei Benutzernamen immer anzeigen"
+    show-via: "„via“ anzeigen"
+    reduce-motion: "Animationen der Benutzeroberfläche reduzieren"
+    this-setting-is-this-device-only: "Nur auf diesem Gerät"
+    use-os-default-emojis: "Betriebssystem-Emojis nutzen"
+    line-width: "Linienstärke"
+    line-width-thin: "Dünn"
+    line-width-normal: "Normal"
+    line-width-thick: "Dick"
+    font-size: "Schriftgröße"
+    font-size-x-small: "Sehr klein"
+    font-size-small: "Klein"
+    font-size-medium: "Normal"
+    font-size-large: "Groß"
+    font-size-x-large: "Sehr groß"
+    deck-column-align: "Spaltenaufteilung der Deck-Ansicht"
+    deck-column-align-center: "Mitte"
+    deck-column-align-left: "Links"
+    deck-column-align-flexible: "Flexibel"
+    deck-column-width: "Spaltenbreite des Decks"
+    deck-column-width-narrow: "Sehr eng"
+    deck-column-width-narrower: "Eng"
+    deck-column-width-normal: "Normal"
+    deck-column-width-wider: "Breit"
+    deck-column-width-wide: "Sehr breit"
+    use-shadow: "Nutze Schatten"
+    rounded-corners: "Abgerundete Ecken"
+    circle-icons: "Kreisförmige Icons"
+    contrasted-acct: "Nutzernamen kontrastreicher darstellen"
+    wallpaper: "Hintergrund"
+    choose-wallpaper: "Hintergrund auswählen"
+    delete-wallpaper: "Hintergrund entfernen"
+    post-form-on-timeline: "Beitragsformular über Timeline anzeigen"
+    show-clock-on-header: "Uhr am oberen rechten Rand anzeigen"
+    show-reply-target: "Zeige bei einer Antwort die ursprüngliche Nachricht"
+    timeline: "Timeline"
+    show-my-renotes: "Zeige eigene Renotes in der Timeline"
+    show-renoted-my-notes: "Zeige Renotes deiner Posts in der Timeline"
+    show-local-renotes: "Zeige Renotes lokaler Posts in der Timeline"
+    remain-deleted-note: "Gelöschte Beiträge weiterhin anzeigen"
+    sound: "Töne"
+    enable-sounds: "Töne aktivieren"
+    enable-sounds-desc: "Spiel einen Ton ab beim Erhalten eines Beitrags bzw. einer Nachricht. Diese Einstellung wird im Browser gespeichert."
+    volume: "Lautstärke"
+    test: "Test"
+    update: "Misskey-Update"
+    version: "Version:"
+    latest-version: "Neuste Version:"
+    update-checking: "Suche nach Updates"
+    do-update: "Nach Updates suchen"
+    update-settings: "Erweiterte Einstellungen"
+    no-updates: "Kein Update verfügbar"
+    no-updates-desc: "Misskey ist aktuell."
+    update-available: "Eine neue Version ist verfügbar!"
+    update-available-desc: "Änderungen werden beim Neuladen der Seite angewendet."
+    advanced-settings: "Erweiterte Einstellungen"
+    debug-mode: "Debug-Modus einschalten"
+    debug-mode-desc: "Diese Einstellung wird im Browser gespeichert."
+    navbar-position: "Postion der Navigationsleiste"
+    navbar-position-top: "Oben"
+    navbar-position-left: "Links"
+    navbar-position-right: "Rechts"
+    i-am-under-limited-internet: "Ich möchte Datenvolumen sparen"
+    post-style: "Beitrags-Anzeigestil"
+    post-style-standard: "Standard"
+    post-style-smart: "Smart"
+    notification-position: "Benachrichtigungen anzeigen"
+    notification-position-bottom: "Unten"
+    notification-position-top: "Oben"
+    disable-via-mobile: "Beitrag nicht als „vom Handy“ markieren"
+    load-raw-images: "Anhänge in voller Größe laden"
+    load-remote-media: "Zeige Inhalte von fremden Servern"
   search: "Suche"
   delete: "Löschen"
   loading: "Laden"
+  ok: "Okay"
+  cancel: "Abbrechen"
   update-available-title: "Aktualisierung verfügbar"
   update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden"
   my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
+  hide-password: "Passwort verbergen"
+  show-password: "Passwort zeigen"
+  enter-username: "Kontonamen eingeben"
   do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktivumgebung verwenden."
+  user-suspended: "Dieser Nutzer wurde gesperrt."
+  is-remote-user: "Diese Nutzerinformationen können unvollständig sein."
+  is-remote-post: "Dies ist ein entfernter Post."
+  view-on-remote: "Vollständige Infos auf Ursprungsserver anzeigen"
+  renoted-by: "Renote von {user}"
+  no-notes: "Keine Beiträge"
+  turn-on-darkmode: "Dunkles Design"
+  turn-off-darkmode: "Helles Design"
   error:
+    title: "Allgemeiner Fehler"
     retry: "Erneut versuchen"
   reversi:
     drawn: "Unentschieden"
     my-turn: "Du bist am Zug"
     opponent-turn: "Dein Gegner ist an der Reihe"
+    turn-of: "{name}s Zug"
+    past-turn-of: "Zug von {name}"
+    won: "{name} hat gewonnen"
     black: "Schwarz"
     white: "Weiß"
     total: "Gesamt"
+    this-turn: "{count}. Zug"
   widgets:
     analog-clock: "Analoge Uhr"
     profile: "Profil"
@@ -173,8 +287,10 @@ common:
     memo: "Notizen"
     trends: "Trends"
     photo-stream: "Bilder"
+    posts-monitor: "Beitrags-Aktivität"
     slideshow: "Diashow"
     version: "Version"
+    broadcast: "Ankündigungen"
     notifications: "Benachrichtigungen"
     users: "Empfohlene Benutzer"
     polls: "Umfrage"
@@ -183,7 +299,9 @@ common:
     nav: "Navigation"
     tips: "Tipps"
     hashtags: "Hashtags"
+    queue: "Warteschlange"
   dev: "Fehler beim Erstellen der Applikation. Bitte versuche es erneut."
+  ai-chan-kawaii: "Ai-chan kawaii!"
   you: "Du"
 auth/views/form.vue:
   share-access: "Erlaubst Du <i>{name}</i> auf deinen Account zuzugreifen?"
@@ -193,17 +311,37 @@ auth/views/form.vue:
 auth/views/index.vue:
   loading: "Lädt"
   denied: "Autorisierung der Anwendung wurde verweigert."
+  denied-paragraph: "Diese App kann nicht auf deinen Account zugreifen."
   already-authorized: "Diese Anwendung ist bereits autorisiert."
   allowed: "Autorisierung der Anwendung wurde erlaubt."
+  callback-url: "Zur App zurückkehren"
   please-go-back: "Bitte gehe zurück zur Anwendung."
   error: "Sitzung ist nicht vorhanden."
   sign-in: "Bitte melde dich an."
+common/views/pages/explore.vue:
+  pinned-users: "Vorgeschlagen"
+  popular-users: "Beliebt"
+  recently-updated-users: "Kürzlich aktiv"
+  recently-registered-users: "Neue Benutzer"
+  popular-tags: "Beliebte Tags"
+  federated: "Aus dem Fediverse"
+  explore: "{host} erkunden"
+  users-info: "Momentan sind {users} Nutzer hier registriert"
+common/views/components/url-preview.vue:
+  enable-player: "Player öffnen"
+  disable-player: "Player schließen"
+common/views/components/user-list.vue:
+  no-users: "Keine Benutzer"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Warten auf {}"
     cancel: "Abbrechen"
 common/views/components/games/reversi/reversi.game.vue:
   surrender: "Aufgeben"
+  surrendered: "durch Aufgabe"
+  is-llotheo: "Der niedrigere gewinnt (Llotheo)"
+  looped-map: "Spielbrettenden verbinden"
+  can-put-everywhere: "Setzen ist überall erlaubt"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "Spiele Reversi mit deinen Freunden!"
@@ -221,7 +359,14 @@ common/views/components/games/reversi/reversi.room.vue:
   black-or-white: "Schwarz/Weiß"
   black-is: "Schwarz ist {}"
   rules: "Regeln"
+  is-llotheo: "Der niedrigere gewinnt (Llotheo)"
+  looped-map: "Spielbrettenden verbinden"
+  can-put-everywhere: "Setzen ist überall erlaubt"
+  settings-of-the-bot: "Bot-Einstellungen"
+  this-game-is-started-soon: "Spiel beginnt gleich"
   waiting-for-other: "Warte auf den Gegner"
+  waiting-for-me: "Warten, bis du bereit bist"
+  waiting-for-both: "Vorbereiten…"
   cancel: "Abbrechen"
   ready: "Bereit"
 common/views/components/connect-failed.vue:
@@ -252,10 +397,13 @@ common/views/components/media-banner.vue:
   sensitive: "Dieser Inhalt ist NSFW"
   click-to-show: "Klicke zum den Inhalt anzusehen"
 common/views/components/theme.vue:
+  theme: "Design"
   light-theme: "Thema"
   dark-theme: "Thema während des Nachtmodus"
   light-themes: "Helles Thema"
   dark-themes: "Dunkles Thema"
+  install-a-theme: "Design wird installiert"
+  theme-code: "Design-Quelltext"
   install: "Anwenden"
   installed: "\"{}\" wurde installiert"
   create-a-theme: "Thema erstellen"
@@ -266,20 +414,37 @@ common/views/components/theme.vue:
   base-theme: "Basisthema"
   base-theme-light: "Hell"
   base-theme-dark: "Dunkel"
+  find-more-theme: "Mehr Designs finden"
   theme-name: "Name des Themas"
   preview-created-theme: "Vorschau"
   invalid-theme: "Thema ist ungültig"
   already-installed: "Thema ist bereits installiert"
+  saved: "Gespeichert"
+  manage-themes: "Designs verwalten"
+  builtin-themes: "Standard-Designs"
+  my-themes: "Meine Designs"
+  installed-themes: "Installierte Designs"
+  select-theme: "Design wählen"
+  uninstall: "Deinstallieren"
+  uninstalled: "„{}“ wurde deinstalliert"
   author: "Autor"
   desc: "Beschreibung"
   export: "Exportieren"
   import: "Importieren"
+  import-by-code: "oder Quelltext einfügen"
+  theme-name-required: "Design-Name ist erforderlich"
 common/views/components/cw-button.vue:
+  hide: "Ausblenden"
+  show: "Mehr"
+  chars: "{count} Zeichen"
+  files: "{count} Dateien"
   poll: "Umfrage"
 common/views/components/messaging.vue:
   search-user: "Einen Nutzer suchen"
   you: "Du"
   no-history: "Keine Chronik"
+  user: "Benutzer"
+  group: "Gruppen"
 common/views/components/messaging-room.vue:
   no-history: "Keine weitere Chronik vorhanden"
   new-message: "Neue Nachricht"
@@ -301,12 +466,28 @@ common/views/components/nav.vue:
   develop: "Entwickler"
   feedback: "Feedback"
 common/views/components/note-menu.vue:
+  mention: "Erwähnungen"
+  detail: "Details"
+  copy-content: "Inhalt kopieren"
+  copy-link: "Link kopieren"
   favorite: "Diesen Beitrag favorisieren"
   unfavorite: "Aus Favoriten entfernen"
+  watch: "Beobachten"
+  unwatch: "Nicht mehr beobachten"
   pin: "An die Profilseite pinnen"
+  unpin: "Lösen"
   delete: "Löschen"
   delete-confirm: "Diesen Beitrag löschen?"
   remote: "Auf Quelle anzeigen"
+common/views/components/user-menu.vue:
+  mention: "Erwähnungen"
+  mute: "Stummschalten"
+  unmute: "Stummschaltung aufheben"
+  mute-confirm: "Bist du sicher, dass du diesen Nutzer stummschalten möchtest?"
+  unmute-confirm: "Stummschaltung für diesen Nutzer aufheben?"
+  block: "Sperren"
+  unblock: "Sperrung aufheben"
+  block-confirm: "Diesen Nutzer wirklich sperren?"
 common/views/components/poll.vue:
   vote-to: "Stimme für '{}'"
   vote-count: "{} Stimmen"
@@ -389,6 +570,8 @@ common/views/components/user-group-editor.vue:
 common/views/components/user-lists.vue:
   user-lists: "Listen"
 common/views/components/user-groups.vue:
+  user-groups: "Gruppen"
+  owned-groups: "Meine Gruppen"
   invites: "Einladen"
 common/views/widgets/broadcast.vue:
   fetching: "Laden"
@@ -399,6 +582,7 @@ common/views/widgets/photo-stream.vue:
   title: "Fotostream"
   no-photos: "Keine Fotos"
 common/views/widgets/posts-monitor.vue:
+  title: "Beitrags-Aktivität"
   toggle: "Sicht umschalten"
 common/views/widgets/server.vue:
   title: "Serverinformationen"
@@ -486,7 +670,7 @@ desktop/views/components/followers.vue:
 desktop/views/components/following.vue:
   empty: "Du folgst niemanden"
 desktop/views/components/home.vue:
-  done: "Verbunden"
+  done: "Beenden"
   add-widget: "Widget hinzufügen:"
   add: "Hinzufügen"
 desktop/views/input-dialog.vue:
@@ -501,6 +685,7 @@ desktop/views/components/note-detail.vue:
 desktop/views/components/note.vue:
   reply: "Antworten"
   renote: "Anmerken"
+  detail: "Details"
   private: "Dieser Beitrag ist privat"
   deleted: "Dieser Beitrag wurde entfernt"
 desktop/views/components/notes.vue:
@@ -579,6 +764,7 @@ desktop/views/components/timeline.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "Dein Profil"
   lists: "Listen"
+  groups: "Gruppen"
 desktop/views/components/ui.header.nav.vue:
   game: "Spielen"
 desktop/views/components/ui.header.notifications.vue:
@@ -592,11 +778,13 @@ desktop/views/components/users-list.vue:
 admin/views/dashboard.vue:
   drive: "Drive"
 admin/views/abuse.vue:
+  details: "Details"
   remove-report: "Löschen"
 admin/views/instance.vue:
   recaptcha-preview: "Vorschau"
   invite: "Einladen"
   save: "Speichern"
+  saved: "Gespeichert"
 admin/views/charts.vue:
   drive: "Drive"
 admin/views/drive.vue:
@@ -616,6 +804,7 @@ admin/views/announcements.vue:
   save: "Speichern"
   remove: "Löschen"
   add: "Hinzufügen"
+  saved: "Gespeichert"
 admin/views/federation.vue:
   status: "Status"
 desktop/views/pages/note.vue:
@@ -674,6 +863,7 @@ mobile/views/components/ui.nav.vue:
   notifications: "Benachrichtigungen"
   search: "Suchen"
   user-lists: "Listen"
+  user-groups: "Gruppen"
   game: "Spielen"
   about: "Über"
 mobile/views/pages/drive.vue:
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 303115d9db..c36550b8c5 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -450,14 +450,22 @@ common/views/components/messaging.vue:
   you: "You"
   no-history: "Without history"
   user: "User"
+  group: "Group"
+  start-with-user: "Start chatting with a user"
+  start-with-group: "Start a group and chat"
+  select-group: "Select a group"
 common/views/components/messaging-room.vue:
+  not-talked-user: "You have not talked to this user yet"
+  not-talked-group: "There is no conversation in this group"
   no-history: "There is no further history"
   new-message: "New message"
+  only-one-file-attached: "You can only attach one file to a message"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Enter message here"
   send: "Send"
   attach-from-local: "Attach files from your device"
   attach-from-drive: "Attach files from your Drive"
+  only-one-file-attached: "You can only attach one file to a message"
 common/views/components/messaging-room.message.vue:
   is-read: "Read"
   deleted: "This message has been deleted"
@@ -542,6 +550,7 @@ common/views/components/poll-editor.vue:
   day: "S"
 common/views/components/reaction-picker.vue:
   choose-reaction: "Send a reaction"
+  input-reaction-placeholder: "or input Emoji"
 common/views/components/emoji-picker.vue:
   custom-emoji: "Custom Emoji"
   people: "People"
@@ -694,14 +703,28 @@ common/views/components/user-list-editor.vue:
   deleted: "Deleted successfully"
   add-user: "Add a user"
 common/views/components/user-group-editor.vue:
+  users: "Members"
+  rename: "Rename group"
+  delete: "Delete group"
+  transfer: "transfer group"
+  transfer-are-you-sure: "Are you sure you want to add @$2 to the group $1?"
+  remove-user: "Remove a user from this group"
   deleted: "Deleted"
   invite: "Invite"
+  invited: "The invitation was successfully sent"
 common/views/components/user-lists.vue:
   user-lists: "Lists"
   create-list: "Create a list"
   list-name: "List name"
 common/views/components/user-groups.vue:
+  user-groups: "Group"
+  create-group: "Create a group"
+  group-name: "Group name"
+  owned-groups: "My groups"
+  joined-groups: "Membership in groups"
   invites: "Invite"
+  accept-invite: "Join"
+  reject-invite: "Decline"
 common/views/widgets/broadcast.vue:
   fetching: "Checking"
   no-broadcasts: "No announcements"
@@ -765,6 +788,8 @@ common/views/pages/follow.vue:
   follow-request: "Follow request"
 common/views/pages/follow-requests.vue:
   received-follow-requests: "Follow requests"
+  accept: "Accept"
+  reject: "Reject"
 desktop:
   banner-crop-title: "Crop the part that appears as a banner"
   banner: "Banner"
@@ -781,7 +806,7 @@ desktop/views/components/activity.chart.vue:
   total: "Black ... Total"
   notes: "Blue ... Notes"
   replies: "Red ... Replies"
-  renotes: "Green ... Repost"
+  renotes: "Green ... Renotes"
 desktop/views/components/activity.vue:
   title: "Activity"
   toggle: "Toggle views"
@@ -878,7 +903,7 @@ desktop/views/components/note-detail.vue:
   private: "Post is private"
   deleted: "Post has been removed"
   location: "Location"
-  renote: "Repost"
+  renote: "Renote"
   add-reaction: "Add a reaction"
   undo-reaction: "Reverse reaction"
 desktop/views/components/note.vue:
@@ -902,10 +927,10 @@ desktop/views/components/post-form.vue:
   quote-placeholder: "Quote this Post..."
   submit: "Post"
   reply: "Reply"
-  renote: "Repost"
+  renote: "Renote"
   posted: "Posted!"
   replied: "Replied!"
-  reposted: "Reposted!"
+  reposted: "Renoted!"
   note-failed: "Failed to post"
   reply-failed: "Failed to reply"
   renote-failed: "Failed to Renote"
@@ -933,13 +958,13 @@ desktop/views/components/progress-dialog.vue:
 desktop/views/components/renote-form.vue:
   quote: "Quote..."
   cancel: "Cancel"
-  renote: "Repost"
+  renote: "Renote"
   renote-home: "Renote (Home)"
   reposting: "Renoting..."
-  success: "Reposted!"
-  failure: "Failed to Repost"
+  success: "Renoted!"
+  failure: "Failed to Renote"
 desktop/views/components/renote-form-window.vue:
-  title: "Do you want to Renote it?"
+  title: "Do you want to renote it?"
 desktop/views/pages/user-following-or-followers.vue:
   following: "{user}'s following"
   followers: "{user}'s follower"
@@ -1036,6 +1061,7 @@ desktop/views/components/ui.header.vue:
 desktop/views/components/ui.header.account.vue:
   profile: "Your profile"
   lists: "Lists"
+  groups: "Group"
   follow-requests: "Follow requests"
   admin: "Admin"
 desktop/views/components/ui.header.nav.vue:
@@ -1109,6 +1135,10 @@ admin/views/instance.vue:
   drive-config: "Drive settings"
   object-storage-base-url: "URL"
   object-storage-endpoint: "Endpoint"
+  object-storage-port: "Port"
+  object-storage-access-key: "Access Key"
+  object-storage-secret-key: "Secret Key"
+  object-storage-use-ssl: "Use SSL"
   cache-remote-files: "Cache remote files"
   cache-remote-files-desc: "Without this parameter, all remote files are linked to their host server directly. This will be an effective solution to save your server storage, however make remote files invisible to users who set direct-link disabled, since no thumbnail will be generated, increase traffic. It is recommended that this parameter set enabled."
   local-drive-capacity-mb: "Volume of Drive per user"
@@ -1117,6 +1147,7 @@ admin/views/instance.vue:
   recaptcha-config: "the reCAPTCHA settings"
   recaptcha-info: "reCAPTCHA token is required. Please get it on https://www.google.com/recaptcha/intro/"
   enable-recaptcha: "enable reCAPTCHA"
+  recaptcha-secret-key: "Secret Key"
   recaptcha-preview: "Preview"
   twitter-integration-config: "Settings of connecting to Twitter"
   twitter-integration-info: "The callback URL is set on {url}."
@@ -1234,6 +1265,8 @@ admin/views/users.vue:
   unsilence-confirm: "Are you certain that you want to stop silencing this user?"
   update-remote-user: "Update information about remote user"
   remote-user-updated: "The information regarding the remote user has been updated."
+  delete-all-files: "Delete all files"
+  delete-all-files-confirm: "Are you sure that you want to delete all files?"
   users:
     title: "Users"
     sort:
@@ -1309,6 +1342,7 @@ admin/views/federation.vue:
   latest-request-received-at: "Last request received at"
   remove-all-following: "Withold all followers"
   remove-all-following-info: "Unfollow all accounts from {host}. Please run this if the instance no longer exists."
+  delete-all-files: "Remove all files"
   block: "Block"
   marked-as-closed: "Marked as closed"
   lookup: "Look up"
@@ -1512,6 +1546,7 @@ mobile/views/components/ui.nav.vue:
   follow-requests: "Follow requests"
   search: "Search"
   user-lists: "Lists"
+  user-groups: "Group"
   widgets: "Widgets"
   game: "Games"
   admin: "Admin"
@@ -1654,6 +1689,9 @@ pages:
   view-source: "View Source"
   view-page: "View page"
   like: "Like"
+  unlike: "Unlike"
+  liked-pages: "Favorite pages"
+  my-pages: "My pages"
   inspector: "Inspector"
   content: "Page block"
   variables: "Variables"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 81b370495d..934f8ba4c5 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -78,6 +78,7 @@ common:
     "write:drive": "Écrire sur le Drive"
     "read:favorites": "Afficher les favoris"
     "write:favorites": "Écrire des favoris"
+    "read:messaging": "Lire les conversations"
     "write:messaging": "Utiliser la messagerie"
     "write:notes": "Créer ou supprimer des publications"
     "read:notifications": "Afficher les notifications"
@@ -438,14 +439,21 @@ common/views/components/messaging.vue:
   you: "Vous"
   no-history: "Pas d'historique"
   user: "Utilisateur·rice·s"
+  group: "Groupe"
+  start-with-user: "Initier une discussion avec un·e utilisateur·rice"
+  select-group: "Sélectionner un groupe"
 common/views/components/messaging-room.vue:
+  not-talked-user: "Vous n'avez pas encore discuté avec cet·te utilisateur·rice"
+  not-talked-group: "Il n y a aucune conversation dans ce groupe"
   no-history: "Aucun historique"
   new-message: "Nouveau message"
+  only-one-file-attached: "Vous ne pouvez joindre qu'un seul fichier au message"
 common/views/components/messaging-room.form.vue:
   input-message-here: "Tapez ici votre message"
   send: "Envoyer"
   attach-from-local: "Joindre un fichier depuis votre ordinateur"
   attach-from-drive: "Joindre un fichier depuis votre Drive"
+  only-one-file-attached: "Vous ne pouvez joindre qu'un seul fichier au message"
 common/views/components/messaging-room.message.vue:
   is-read: "Lu"
   deleted: "Ce message a été supprimé"
@@ -679,13 +687,19 @@ common/views/components/user-group-editor.vue:
   delete: "Supprimer le groupe"
   deleted: "Supprimé"
   invite: "Inviter"
+  invited: "Invitation envoyée avec succès"
 common/views/components/user-lists.vue:
   user-lists: "Listes"
   create-list: "Créer une liste"
   list-name: "Nom de la liste"
 common/views/components/user-groups.vue:
+  user-groups: "Groupe"
   create-group: "Créer un groupe"
+  group-name: "Nom du groupe"
+  owned-groups: "Mes groupes"
+  joined-groups: "Membre dans les groupes"
   invites: "Inviter"
+  accept-invite: "Participer"
   reject-invite: "Refuser"
 common/views/widgets/broadcast.vue:
   fetching: "Récupération"
@@ -1051,7 +1065,7 @@ admin/views/index.vue:
   instance: "Instance"
   emoji: "Émoji"
   moderators: "Modérateurs"
-  users: "Utilisateurs"
+  users: "Utilisateur·rice·s"
   federation: "Fédération"
   announcements: "Annonces"
   abuse: "Abus"
@@ -1095,8 +1109,11 @@ admin/views/instance.vue:
   drive-config: "Paramètres du lecteur"
   object-storage-base-url: "URL"
   object-storage-endpoint: "Point de terminaison"
+  object-storage-port: "Port"
   object-storage-access-key: "Clé d'accès"
   object-storage-secret-key: "Clé secrète"
+  object-storage-use-ssl: "Utiliser SSL"
+  object-storage-s3-info-here: "ici"
   cache-remote-files: "Mettre en cache des fichiers distants"
   local-drive-capacity-mb: "Volume du lecteur par utilisateur"
   remote-drive-capacity-mb: "Volume du lecteur par utilisateur distant"
@@ -1106,6 +1123,7 @@ admin/views/instance.vue:
   enable-recaptcha: "Activation de reCAPTCHA"
   recaptcha-secret-key: "Clé secrète"
   recaptcha-preview: "Prévisualisation"
+  hidden-tags: "Tags cachés"
   twitter-integration-config: "Paramètres de connexion à Twitter"
   twitter-integration-info: "L'URL de callback est {url}."
   enable-twitter-integration: "Activer la connexion à Twitter"
@@ -1218,7 +1236,7 @@ admin/views/users.vue:
   update-remote-user: "Mettre à jour les informations de l’utilisateur·rice distant·e"
   remote-user-updated: "Les informations de l’utilisateur·rice distant·e ont étés mis à jour"
   users:
-    title: "Utilisateurs"
+    title: "Utilisateur·rice·s"
     sort:
       title: "Trier par"
       createdAtAsc: "Date d’inscription (Ascendant)"
@@ -1433,7 +1451,7 @@ mobile/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
 common/views/components/follow-button.vue:
-  following: "Abonné"
+  following: "Abonné·e"
   follow: " Suivre"
   request-pending: "Demande en attente"
   follow-processing: "En cours d’abonnement"
@@ -1483,6 +1501,7 @@ mobile/views/components/ui.nav.vue:
   follow-requests: "Demandes d’abonnement"
   search: "Rechercher"
   user-lists: "Listes"
+  user-groups: "Groupe"
   widgets: "Modules"
   game: "Jeux"
   admin: "Admin"
@@ -1498,9 +1517,9 @@ mobile/views/pages/drive.vue:
 mobile/views/pages/signup.vue:
   lets-start: "Votre compte est prêt ! 📦"
 mobile/views/pages/followers.vue:
-  followers-of: "Abonnés de {name}"
+  followers-of: "Abonné·e·s de {name}"
 mobile/views/pages/following.vue:
-  following-of: "Abonnés de {name}"
+  following-of: "Abonné·e·s de {name}"
 mobile/views/pages/home.vue:
   home: "Accueil"
   local: "Local"
@@ -1752,16 +1771,32 @@ pages:
       _gtEq:
         arg1: "A"
         arg2: "B"
+      _if:
+        arg1: "Si"
+        arg2: "donc"
+        arg3: "sinon"
+      not: "négation"
+      _not:
+        arg1: "négation"
       random: "Aléatoire"
       _randomPick:
         arg1: "Listes"
+      _dailyRandom:
+        arg1: "Probabilité"
+      _dailyRannum:
+        arg1: "Minimum"
+        arg2: "Maximum"
       _dailyRandomPick:
         arg1: "Listes"
+      _seedRandom:
+        arg2: "Probabilité"
       _seedRannum:
         arg2: "Min"
         arg3: "Max"
       _seedRandomPick:
         arg2: "Listes"
+      _DRPWPM:
+        arg1: "Liste de texte"
       pick: "Sélectionner dans la liste"
       _pick:
         arg1: "Listes"
@@ -1781,9 +1816,12 @@ pages:
         slots: "Emplacement"
         arg1: "Sortie"
       for: "Répéter"
+    thereIsEmptySlot: "Slot {slot} est vide !"
     types:
       string: "Texte"
       number: "Numérique"
       array: "Listes"
       stringArray: "Liste de texte"
+    emptySlot: "Slot vide"
     enviromentVariables: "Variables d'environnement"
+    pageVariables: "Élément de page"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 562a3d19e5..47e16d5d45 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -20,7 +20,7 @@ common:
     outro: "이외에도 Misskey에만 있는 기능이 아직도 더 있으니 부디 여러분 자신의 눈으로 확인해보시기 바랍니다. Misskey는 분산형 SNS라서 이 인스턴스가 마음에 들지 않으신다면 다른 인스턴스를 시도해보실 수도 있습니다. 그럼, GLHF!"
   adblock:
     detected: "광고 차단기를 해제하십시오"
-    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 그러나 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없게 될 가능성이나 결함이 발생하는 경우가 있습니다."
+    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 하지만 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없거나 문제가 발생할 수 있습니다."
   application-authorization: "앱 연계"
   close: "닫기"
   do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
@@ -42,7 +42,7 @@ common:
     gotit: "Got it!"
   notification:
     file-uploaded: "파일이 업로드되었습니다"
-    message-from: "{}님으로부터 메시지:"
+    message-from: "{}님의 메시지:"
     reversi-invited: "게임 초대가 있습니다"
     reversi-invited-by: "{}님으로부터"
     notified-by: "{}님으로부터"
@@ -51,7 +51,7 @@ common:
   time:
     unknown: "알 수 없는 시간"
     future: "미래"
-    just_now: "방금"
+    just_now: "방금 전"
     seconds_ago: "{}초 전"
     minutes_ago: "{}분 전"
     hours_ago: "{}시간 전"
@@ -67,19 +67,19 @@ common:
   home: "홈"
   deck: "덱"
   timeline: "타임라인"
-  explore: "발견"
+  explore: "발견하기"
   following: "팔로우 중"
   followers: "팔로워"
   favorites: "즐겨찾기"
   permissions:
-    "read:account": "계정 정보 보기"
-    "write:account": "계정 정보 변경"
-    "read:blocks": "차단 보기"
-    "write:blocks": "차단 수정"
-    "read:drive": "드라이브 보기"
-    "write:drive": "드라이브 수정"
-    "read:favorites": "즐겨찾기 보기"
-    "write:favorites": "즐겨찾기 수정"
+    "read:account": "계정의 정보를 볼 수 있습니다."
+    "write:account": "계정의 정보를 변경할 수 있습니다."
+    "read:blocks": "차단 목록을 볼 수 있습니다."
+    "write:blocks": "차단 목록을 조작할 수 있습니다."
+    "read:drive": "드라이브의 파일들을 볼 수 있습니다."
+    "write:drive": "드라이브의 파일들을 조작할 수 있습니다."
+    "read:favorites": "즐겨찾기 목록을 볼 수 있습니다."
+    "write:favorites": "즐겨찾기 목록을 조작할 수 있습니다."
     "read:following": "팔로우 정보 보기"
     "write:following": "팔로잉, 팔로우 수정"
     "read:messaging": "대화 보기"
@@ -550,6 +550,7 @@ common/views/components/poll-editor.vue:
   day: "일"
 common/views/components/reaction-picker.vue:
   choose-reaction: "리액션 선택"
+  input-reaction-placeholder: "또는 이모지 입력"
 common/views/components/emoji-picker.vue:
   custom-emoji: "커스텀 이모지"
   people: "사람들"
@@ -705,6 +706,9 @@ common/views/components/user-group-editor.vue:
   users: "멤버"
   rename: "그룹명을 변경"
   delete: "그룹을 삭제"
+  transfer: "그룹을 양도"
+  transfer-are-you-sure: "그룹 「$1」을 「@$2」 님에게 양도하시겠습니까?"
+  transferred: "그룹을 양도하였습니다"
   remove-user: "이 그룹에서 삭제"
   delete-are-you-sure: "그룹 「$1」을 삭제하시겠습니까?"
   deleted: "삭제하였습니다"
@@ -1152,6 +1156,7 @@ admin/views/instance.vue:
   mb: "메가바이트 단위"
   recaptcha-config: "reCAPCHA 설정"
   recaptcha-info: "reCAPCHA를 사용하도록 설정하는 경우 reCAPCHA 토큰을 확보해야 합니다. https://www.google.com/recaptcha/intro/ 에 접속하여 토큰을 가져와주십시오."
+  recaptcha-info2: "v3는지원하지 않습니다. v2를 사용하여 주십시오."
   enable-recaptcha: "reCAPCHA 활성화"
   recaptcha-site-key: "사이트 키"
   recaptcha-secret-key: "시크릿 키"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 8752bf3347..ec62f21b23 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -453,6 +453,7 @@ common/views/components/messaging.vue:
   group: "群组"
   start-with-user: "开始用户聊天"
   start-with-group: "开始群组聊天"
+  select-group: "请选择群组"
 common/views/components/messaging-room.vue:
   not-talked-user: "没有用户的会话记录"
   not-talked-group: "没有群组的会话记录"
@@ -704,10 +705,14 @@ common/views/components/user-group-editor.vue:
   users: "成员"
   rename: "更改群组名"
   delete: "删除群组"
+  transfer: "群组转让"
+  transfer-are-you-sure: "将群组「$1」转让给「@$2」吗？"
+  transferred: "群组已转让"
   remove-user: "从本群组中删除"
   delete-are-you-sure: "确定要删除「$1」组？"
   deleted: "已删除"
   invite: "邀请"
+  invited: "邀请已发送"
 common/views/components/user-lists.vue:
   user-lists: "列表"
   create-list: "创建列表"
@@ -716,7 +721,10 @@ common/views/components/user-groups.vue:
   user-groups: "群组"
   create-group: "创建群组"
   group-name: "群组名"
+  owned-groups: "我的群组"
+  joined-groups: "加入群组"
   invites: "邀请"
+  accept-invite: "加入"
   reject-invite: "拒绝"
 common/views/widgets/broadcast.vue:
   fetching: "确认中"
@@ -1147,6 +1155,7 @@ admin/views/instance.vue:
   mb: "以兆字节(Mbps)为单位"
   recaptcha-config: "reCAPTCHA设置"
   recaptcha-info: "reCAPTCHA token是必要的. 请从 https://www.google.com/recaptcha/intro/ 获取。\n请注意, 该功能在中国大陆不可用。"
+  recaptcha-info2: "不支持v3。请使用v2。"
   enable-recaptcha: "启用 reCAPTCHA\n(请注意, 此功能在中国大陆不可用. 如果启用, 可能导致无法正常使用登录或注册等功能)"
   recaptcha-site-key: "网站密钥"
   recaptcha-secret-key: "密钥"

From 0f6cd3c125a52d0b1f62b4c0dedd9a64d98297d2 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 May 2019 09:21:21 +0900
Subject: [PATCH 36/36] 11.19.0

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 782482bc89..7eecb7b8ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,27 @@ mongodb:
 8. master ブランチに戻す
 9. enjoy
 
+11.19.0 (2019/05/25)
+--------------------
+### ✨Improvements
+* グループのオーナーを変えられるように
+* PagesでURLプレビューを表示するように
+* サーバーログを削除できるように
+* リンク先が同じインスタンスの投稿内のURLをクリックしたときは新しいタブで開かないように
+* PostgreSQLの接続オプションを設定ファイルで設定できるように
+* いくつかのAPIでのパフォーマンスを向上
+* ユーザビリティの向上
+* デザインの調整
+
+### 🐛Fixes
+* デッキでユーザーページを遷移したときに前のユーザーのタイムラインが残り続ける問題を修正
+* デッキでフォロー申請が見れない問題を修正
+* グループ情報が更新できない問題を修正
+* Firefoxでトークの下が隠れてしまう問題を修正
+* トーク履歴がないと履歴が読み込み中のままになる問題を修正
+* 通知で長い名前のユーザーがいると横スクロールが発生する問題を修正
+* iOSでの選択ダイアログの動作を修正
+
 11.18.1 (2019/05/21)
 --------------------
 ### 🐛Fixes
diff --git a/package.json b/package.json
index 8f24865827..c0e7358b91 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.18.1",
+	"version": "11.19.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",