9.0.0

.config/example.yml

@@ -101,8 +101,8 @@ drive:
 # TLS
 # https:
 #   # path for certification
-#   key: example-tls-key
+#   key: /etc/letsencrypt/live/example.tld/privkey.pem
-#   cert: example-tls-cert
+#   cert: /etc/letsencrypt/live/example.tld/fullchain.pem
 
 # Elasticsearch
 # elasticsearch:

CHANGELOG.md

@@ -5,6 +5,12 @@ ChangeLog
 
 This document describes breaking changes only.
 
+9.0.0
+-----
+
+Misskey v8.64.0 を使っている方は、9.0.0に際しては特にすべきことはありません。
+Misskey v8.64.0 に満たないバージョンをお使いの方は、一旦8.64.0にアップデートして(そして起動して)から9.0.0に再度アップデートしてください。
+
 8.0.0
 -----
 

locales/en-US.yml

@@ -439,6 +439,7 @@ common/views/pages/follow.vue:
   following: "Following"
   follow: "Follow"
   request-pending: "Pending follow request"
+  follow-processing: "Processing follow"
   follow-request: "Follow request"
 desktop:
   banner-crop-title: "Crop the part that appears as a banner"
@@ -565,6 +566,7 @@ desktop/views/components/follow-button.vue:
   following: "Following"
   follow: "Follow"
   request-pending: "Pending follow request"
+  follow-processing: "Processing follow"
   follow-request: "Follow request"
 desktop/views/components/followers-window.vue:
   followers: "{}'s followers"
@@ -1044,6 +1046,7 @@ mobile/views/components/follow-button.vue:
   following: "Following"
   follow: "Follow"
   request-pending: "Pending follow request"
+  follow-processing: "Processing follow"
   follow-request: "Follow request"
 mobile/views/components/friends-maker.vue:
   title: "Let's follow them"

locales/ja-JP.yml

@@ -514,6 +514,7 @@ common/views/pages/follow.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
+  follow-processing: "フォロー処理中"
   follow-request: "フォロー申請"
 
 desktop:
@@ -656,6 +657,7 @@ desktop/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
+  follow-processing: "フォロー処理中"
   follow-request: "フォロー申請"
 
 desktop/views/components/followers-window.vue:
@@ -1232,6 +1234,7 @@ mobile/views/components/follow-button.vue:
   following: "フォロー中"
   follow: "フォロー"
   request-pending: "フォロー許可待ち"
+  follow-processing: "フォロー処理中"
   follow-request: "フォロー申請"
 
 mobile/views/components/friends-maker.vue:

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "8.64.0",
+	"version": "9.0.0",
-	"clientVersion": "1.0.10046",
+	"clientVersion": "1.0.10049",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/common/views/pages/follow.vue

@@ -19,7 +19,8 @@
 			@click="onClick"
 			:disabled="followWait">
 		<template v-if="!followWait">
-			<template v-if="user.hasPendingFollowRequestFromYou">%fa:hourglass-half% %i18n:@request-pending%</template>
+			<template v-if="user.hasPendingFollowRequestFromYou && user.isLocked">%fa:hourglass-half% %i18n:@request-pending%</template>
+			<template v-else-if="user.hasPendingFollowRequestFromYou && !user.isLocked">%fa:hourglass-start% %i18n:@follow-processing%</template>
 			<template v-else-if="user.isFollowing">%fa:minus% %i18n:@following%</template>
 			<template v-else-if="!user.isFollowing && user.isLocked">%fa:plus% %i18n:@follow-request%</template>
 			<template v-else-if="!user.isFollowing && !user.isLocked">%fa:plus% %i18n:@follow%</template>

src/client/app/desktop/views/components/follow-button.vue

@@ -5,7 +5,8 @@
 	:disabled="wait"
 >
 	<template v-if="!wait">
-		<template v-if="u.hasPendingFollowRequestFromYou">%fa:hourglass-half%<template v-if="size == 'big'"> %i18n:@request-pending%</template></template>
+		<template v-if="u.hasPendingFollowRequestFromYou && u.isLocked">%fa:hourglass-half%<template v-if="size == 'big'"> %i18n:@request-pending%</template></template>
+		<template v-else-if="u.hasPendingFollowRequestFromYou && !u.isLocked">%fa:hourglass-start%<template v-if="size == 'big'"> %i18n:@follow-processing%</template></template>
 		<template v-else-if="u.isFollowing">%fa:minus%<template v-if="size == 'big'"> %i18n:@following%</template></template>
 		<template v-else-if="!u.isFollowing && u.isLocked">%fa:plus%<template v-if="size == 'big'"> %i18n:@follow-request%</template></template>
 		<template v-else-if="!u.isFollowing && !u.isLocked">%fa:plus%<template v-if="size == 'big'"> %i18n:@follow%</template></template>

src/client/app/mobile/views/components/follow-button.vue

@@ -5,7 +5,8 @@
 	:disabled="wait"
 >
 	<template v-if="!wait">
-		<template v-if="u.hasPendingFollowRequestFromYou">%fa:hourglass-half% %i18n:@request-pending%</template>
+		<template v-if="u.hasPendingFollowRequestFromYou && u.isLocked">%fa:hourglass-half% %i18n:@request-pending%</template>
+		<template v-else-if="u.hasPendingFollowRequestFromYou && !u.isLocked">%fa:hourglass-start% %i18n:@follow-processing%</template>
 		<template v-else-if="u.isFollowing">%fa:minus% %i18n:@following%</template>
 		<template v-else-if="!u.isFollowing && u.isLocked">%fa:plus% %i18n:@follow-request%</template>
 		<template v-else-if="!u.isFollowing && !u.isLocked">%fa:plus% %i18n:@follow%</template>

src/models/note.ts

@@ -27,21 +27,6 @@ Note.createIndex({
 });
 export default Note;
 
-// 後方互換性のため
-Note.findOne({
-	fileIds: { $exists: true }
-}).then(n => {
-	if (n == null) {
-		Note.update({}, {
-			$rename: {
-				mediaIds: 'fileIds'
-			}
-		}, {
-			multi: true
-		});
-	}
-});
-
 export function isValidText(text: string): boolean {
 	return length(text.trim()) <= 1000 && text.trim() != '';
 }

src/models/stats.ts

@@ -3,11 +3,6 @@ import db from '../db/mongodb';
 
 const Stats = db.get<IStats>('stats');
 
-// 後方互換性のため
-Stats.dropIndex({ date: -1 } as any).catch((e: mongo.MongoError) => {
-	if (e.code !== 27) throw e;
-});
-
 Stats.createIndex({ span: -1, date: -1 }, { unique: true });
 export default Stats;
 

src/models/user.ts

@@ -35,28 +35,6 @@ User.createIndex('uri', { sparse: true, unique: true });
 
 export default User;
 
-// 後方互換性のため
-User.findOne({
-	pinnedNoteId: { $exists: true }
-}).then(async x => {
-	if (x == null) return;
-
-	const users = await User.find({
-		pinnedNoteId: { $exists: true }
-	});
-
-	users.forEach(u => {
-		User.update({ _id: u._id }, {
-			$set: {
-				pinnedNoteIds: [(u as any).pinnedNoteId]
-			},
-			$unset: {
-				pinnedNoteId: ''
-			}
-		});
-	});
-});
-
 type IUserBase = {
 	_id: mongo.ObjectID;
 	createdAt: Date;