Merge branch 'develop' into ssmucny-events

CHANGELOG.md

@@ -1,5 +1,5 @@
 <!--
-## 13.x.x (unreleased)
+## 2023.x.x (unreleased)
 
 ### General
 -
@@ -12,6 +12,17 @@
 
 -->
 
+## 2023.8.0 (unreleased)
+
+### General
+- OAuth 2.0のサポート
+
+### Client
+-
+
+### Server
+-
+
 ## 13.14.2
 
 ### Client

packages/backend/src/server/oauth/OAuth2ProviderService.ts

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import dns from 'node:dns/promises';
 import { fileURLToPath } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';

packages/backend/test/e2e/oauth.ts

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 /**
  * Basic OAuth tests to make sure the library is correctly integrated to Misskey
  * and not regressed by version updates or potential migration to another library.

packages/frontend/src/components/MkPostForm.vue

@@ -777,18 +777,25 @@ async function post(ev?: MouseEvent) {
 				claimAchievement('notes1');
 			}
 
-			const text = postData.text?.toLowerCase() ?? '';
+			const text = postData.text ?? '';
-			if ((text.includes('love') || text.includes('❤')) && text.includes('misskey')) {
+			const lowerCase = text.toLowerCase();
+			if ((lowerCase.includes('love') || lowerCase.includes('❤')) && lowerCase.includes('misskey')) {
 				claimAchievement('iLoveMisskey');
 			}
-			if (
+			if ([
-				text.includes('https://youtu.be/Efrlqw8ytg4'.toLowerCase()) ||
+				'https://youtu.be/Efrlqw8ytg4',
-				text.includes('https://www.youtube.com/watch?v=Efrlqw8ytg4'.toLowerCase()) ||
+				'https://www.youtube.com/watch?v=Efrlqw8ytg4',
-				text.includes('https://m.youtube.com/watch?v=Efrlqw8ytg4'.toLowerCase()) ||
+				'https://m.youtube.com/watch?v=Efrlqw8ytg4',
-				text.includes('https://youtu.be/XVCwzwxdHuA'.toLowerCase()) ||
+			
-				text.includes('https://www.youtube.com/watch?v=XVCwzwxdHuA'.toLowerCase()) ||
+				'https://youtu.be/XVCwzwxdHuA',
-				text.includes('https://m.youtube.com/watch?v=XVCwzwxdHuA'.toLowerCase())
+				'https://www.youtube.com/watch?v=XVCwzwxdHuA',
-			) {
+				'https://m.youtube.com/watch?v=XVCwzwxdHuA',
+
+				'https://open.spotify.com/track/3Cuj0mZrlLoXx9nydNi7RB',
+				'https://open.spotify.com/track/7anfcaNPQWlWCwyCHmZqNy',
+				'https://open.spotify.com/track/5Odr16TvEN4my22K9nbH7l',
+				'https://open.spotify.com/album/5bOlxyl4igOrp2DwVQxBco',
+			].some(url => text.includes(url))) {
 				claimAchievement('brainDiver');
 			}
 

packages/frontend/src/pages/oauth.vue

@@ -1,3 +1,8 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader/></template>