Merge branch 'develop'

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -16,11 +16,11 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 
 <!-- Tell us what the bug is -->
 
-## 🥰 Expected Behavior
+## 🙂 Expected Behavior
 
 <!--- Tell us what should happen -->
 
-## 🤬 Actual Behavior
+## ☹️ Actual Behavior
 
 <!--- Tell us what happens instead of the expected behavior -->
 
@@ -33,7 +33,3 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 ## 📌 Environment
 
 <!-- Tell us where on the platform it happens -->
-
-Misskey version:
-Your OS:
-Your browser:

locales/index.js

@@ -24,7 +24,6 @@ const languages = [
 	'fr-FR',
 	'id-ID',
 	'it-IT',
-	'ja-NY',
 	'ja-JP',
 	'ja-KS',
 	'kab-KAB',
@@ -57,7 +56,6 @@ module.exports = Object.entries(locales)
 		const [lang] = k.split('-');
 		switch (k) {
 			case 'ja-JP': return v;
-			case 'ja-NY':
 			case 'ja-KS':
 			case 'en-US': return merge(locales['ja-JP'], v);
 			default: return merge(

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "12.103.1-simkey",
+	"version": "12.103.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/sim1222/misskey.git"
+		"url": "https://github.com/misskey-dev/misskey.git"
 	},
 	"private": true,
 	"scripts": {
@@ -46,7 +46,7 @@
 		"@types/fluent-ffmpeg": "2.1.20",
 		"@typescript-eslint/parser": "5.10.0",
 		"cross-env": "7.0.3",
-		"cypress": "9.4.1",
+		"cypress": "9.3.1",
 		"start-server-and-test": "1.14.0",
 		"typescript": "4.5.5"
 	}

packages/backend/src/misc/is-duplicate-key-value-error.ts

@@ -1,3 +1,3 @@
-export function isDuplicateKeyValueError(e: unknown | Error): boolean {
+export function isDuplicateKeyValueError(e: Error): boolean {
-	return (e as any).message && (e as Error).message.startsWith('duplicate key value');
+	return e.message.startsWith('duplicate key value');
 }

packages/backend/src/server/api/call.ts

@@ -90,7 +90,7 @@ export default async (endpoint: string, user: User | null | undefined, token: Ac
 
 	// API invoking
 	const before = performance.now();
-	return await ep.exec(data, user, token, ctx?.file).catch((e: Error) => {
+	return await ep.exec(data, user, token, ctx!.file).catch((e: Error) => {
 		if (e instanceof ApiError) {
 			throw e;
 		} else {

packages/backend/src/server/api/stream/types.ts

@@ -105,10 +105,7 @@ export interface NoteStreamTypes {
 	};
 	reacted: {
 		reaction: string;
-		emoji?: {
+		emoji?: Emoji;
-			name: string;
-			url: string;
-		} | null;
 		userId: User['id'];
 	};
 	unreacted: {

packages/backend/src/server/web/manifest.json

@@ -4,7 +4,7 @@
 	"start_url": "/",
 	"display": "standalone",
 	"background_color": "#313a42",
-	"theme_color": "#a7dc4e",
+	"theme_color": "#86b300",
 	"icons": [
 		{
 			"src": "/static-assets/icons/192.png",

packages/backend/src/server/web/views/base.pug

@@ -19,9 +19,8 @@ html
 		meta(charset='utf-8')
 		meta(name='application-name' content='Misskey')
 		meta(name='referrer' content='origin')
-		meta(name='theme-color' content='#a7dc4e')
+		meta(name='theme-color' content='#86b300')
-		meta(name='theme-color-orig' content='#a7dc4e')
+		meta(name='theme-color-orig' content='#86b300')
-		meta(property='twitter:card' content='summary')
 		meta(property='og:site_name' content= instanceName || 'Misskey')
 		meta(name='viewport' content='width=device-width, initial-scale=1')
 		link(rel='icon' href= icon || '/favicon.ico')
@@ -43,8 +42,6 @@ html
 		block meta
 
 		block og
-			meta(property='og:title'       content= title || 'Misskey') 
-			meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') 
 			meta(property='og:image' content=img)
 
 		style

packages/backend/src/server/web/views/channel.pug

@@ -16,3 +16,6 @@ block og
 	meta(property='og:description' content= channel.description)
 	meta(property='og:url'         content= url)
 	meta(property='og:image'       content= channel.bannerUrl)
+
+block meta
+	meta(name='twitter:card' content='summary')

packages/backend/src/server/web/views/clip.pug

@@ -26,6 +26,8 @@ block meta
 	meta(name='misskey:user-id' content=user.id)
 	meta(name='misskey:clip-id' content=clip.id)
 
+	meta(name='twitter:card' content='summary')
+
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)

packages/backend/src/server/web/views/gallery-post.pug

@@ -25,6 +25,8 @@ block meta
 	meta(name='misskey:user-username' content=user.username)
 	meta(name='misskey:user-id' content=user.id)
 
+	meta(name='twitter:card' content='summary')
+
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)

packages/backend/src/server/web/views/note.pug

@@ -27,6 +27,8 @@ block meta
 	meta(name='misskey:user-id' content=user.id)
 	meta(name='misskey:note-id' content=note.id)
 
+	meta(name='twitter:card' content='summary')
+
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)

packages/backend/src/server/web/views/page.pug

@@ -26,6 +26,8 @@ block meta
 	meta(name='misskey:user-id' content=user.id)
 	meta(name='misskey:page-id' content=page.id)
 
+	meta(name='twitter:card' content='summary')
+
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)

packages/backend/src/server/web/views/user.pug

@@ -25,6 +25,8 @@ block meta
 	meta(name='misskey:user-username' content=user.username)
 	meta(name='misskey:user-id' content=user.id)
 
+	meta(name='twitter:card' content='summary')
+
 	if profile.twitter
 		meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)
 

packages/backend/src/services/note/create.ts

@@ -59,7 +59,7 @@ class NotificationManager {
 
 		if (exist) {
 			// 「メンションされているかつ返信されている」場合は、メンションとしての通知ではなく返信としての通知にする
-			if (reason !== 'mention') {
+			if (reason != 'mention') {
 				exist.reason = reason;
 			}
 		} else {
@@ -201,7 +201,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 		mentionedUsers.push(await Users.findOneOrFail(data.reply.userId));
 	}
 
-	if (data.visibility === 'specified') {
+	if (data.visibility == 'specified') {
 		if (data.visibleUsers == null) throw new Error('invalid param');
 
 		for (const u of data.visibleUsers) {
@@ -301,7 +301,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 		if (Users.isRemoteUser(user)) activeUsersChart.update(user);
 
 		// 未読通知を作成
-		if (data.visibility === 'specified') {
+		if (data.visibility == 'specified') {
 			if (data.visibleUsers == null) throw new Error('invalid param');
 
 			for (const u of data.visibleUsers) {
@@ -439,7 +439,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 async function renderNoteOrRenoteActivity(data: Option, note: Note) {
 	if (data.localOnly) return null;
 
-	const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length === 0)
+	const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length == 0)
 		? renderAnnounce(data.renote.uri ? data.renote.uri : `${config.url}/notes/${data.renote.id}`, note)
 		: renderCreate(await renderNote(note, false), note);
 
@@ -478,7 +478,7 @@ async function insertNote(user: { id: User['id']; host: User['host']; }, data: O
 		userId: user.id,
 		localOnly: data.localOnly!,
 		visibility: data.visibility as any,
-		visibleUserIds: data.visibility === 'specified'
+		visibleUserIds: data.visibility == 'specified'
 			? data.visibleUsers
 				? data.visibleUsers.map(u => u.id)
 				: []
@@ -502,7 +502,7 @@ async function insertNote(user: { id: User['id']; host: User['host']; }, data: O
 		insert.mentions = mentionedUsers.map(u => u.id);
 		const profiles = await UserProfiles.find({ userId: In(insert.mentions) });
 		insert.mentionedRemoteUsers = JSON.stringify(mentionedUsers.filter(u => Users.isRemoteUser(u)).map(u => {
-			const profile = profiles.find(p => p.userId === u.id);
+			const profile = profiles.find(p => p.userId == u.id);
 			const url = profile != null ? profile.url : null;
 			return {
 				uri: u.uri,

packages/backend/src/services/note/delete.ts

@@ -39,7 +39,7 @@ export default async function(user: User, note: Note, quiet = false) {
 			let renote: Note | undefined;
 
 			// if deletd note is renote
-			if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
+			if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length == 0)) {
 				renote = await Notes.findOne({
 					id: note.renoteId,
 				});

packages/backend/src/services/note/reaction/create.ts

@@ -76,7 +76,7 @@ export default async (user: { id: User['id']; host: User['host']; }, note: Note,
 	// カスタム絵文字リアクションだったら絵文字情報も送る
 	const decodedReaction = decodeReaction(reaction);
 
-	const emoji = await Emojis.findOne({
+	let emoji = await Emojis.findOne({
 		where: {
 			name: decodedReaction.name,
 			host: decodedReaction.host,

packages/backend/src/services/note/read.ts

@@ -52,7 +52,7 @@ export default async function(
 
 		if (note.user != null) { // たぶんnullになることは無いはずだけど一応
 			for (const antenna of myAntennas) {
-				if (await checkHitAntenna(antenna, note, note.user, undefined, Array.from(following))) {
+				if (await checkHitAntenna(antenna, note, note.user as any, undefined, Array.from(following))) {
 					readAntennaNotes.push(note);
 				}
 			}

packages/backend/src/services/send-email.ts

@@ -114,9 +114,9 @@ export async function sendEmail(to: string, subject: string, html: string, text:
 </html>`,
 		});
 
-		logger.info(`Message sent: ${info.messageId}`);
+		logger.info('Message sent: %s', info.messageId);
-	} catch (err) {
+	} catch (e) {
-		logger.error(err as Error);
+		logger.error(e);
-		throw err;
+		throw e;
 	}
 }

packages/client/src/components/chart.vue

@@ -250,15 +250,7 @@ export default defineComponent({
 					},
 					interaction: {
 						intersect: false,
-						mode: 'index',
 					},
-					elements: {
-						point: {
-							hoverRadius: 5,
-							hoverBorderWidth: 2,
-						},
-					},
-					animation: false,
 					plugins: {
 						legend: {
 							display: props.detailed,

packages/client/src/init.ts

@@ -14,7 +14,7 @@ if (localStorage.getItem('accounts') != null) {
 //#endregion
 
 import { computed, createApp, watch, markRaw, version as vueVersion } from 'vue';
-import compareVersions from 'compare-versions';
+import * as compareVersions from 'compare-versions';
 
 import widgets from '@/widgets';
 import directives from '@/directives';

packages/client/src/widgets/server-metric/pie.vue

@@ -29,7 +29,7 @@ const props = defineProps<{
 
 const r = 0.45;
 
-const color = `hsl(248%, 80%, 70%)`;
+const color = $computed(() => `hsl(${180 - (props.value * 180)}, 80%, 70%)`);
 const strokeDashoffset = $computed(() => (1 - props.value) * (Math.PI * (r * 2)));
 </script>
 

yarn.lock

@@ -1117,10 +1117,10 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cypress@9.4.1:
+cypress@9.3.1:
-  version "9.4.1"
+  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.4.1.tgz#1a4ba706435829c24b7edf350c2b059e05da9084"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.3.1.tgz#8116f52d49d6daf90a91e88f3eafd940234d2958"
-  integrity sha512-+JgMG9uT+QFx97JU9kOHE3jO3+0UdkQ9H1oCBiC7A74qme7Jkdy2sYDBCPjjGczutnWnGUTMRlwiNMP/Uq6LrQ==
+  integrity sha512-BODdPesxX6bkVUnH8BVsV8I/jn57zQtO1FEOUTiuG2us3kslW7g0tcuwiny7CKCmJUZz8S/D587ppC+s58a+5Q==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -1159,10 +1159,10 @@ cypress@9.4.1:
     pretty-bytes "^5.6.0"
     proxy-from-env "1.0.0"
     request-progress "^3.0.0"
-    semver "^7.3.2"
     supports-color "^8.1.1"
     tmp "~0.2.1"
     untildify "^4.0.0"
+    url "^0.11.0"
     yauzl "^2.10.0"
 
 d@1, d@^1.0.1:
@@ -3422,6 +3422,11 @@ pumpify@^1.3.5:
     inherits "^2.0.3"
     pump "^2.0.0"
 
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -3445,6 +3450,11 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -3726,7 +3736,7 @@ semver-greatest-satisfied-range@^1.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^7.3.2, semver@^7.3.5:
+semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -4343,6 +4353,14 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"