Merge branch 'develop' into ssmucny-events

chore(frontend): support Spotify for brainDiver (#11407 )
* chore(frontend): support Spotify for brainDiver * no lowercase * album * syntax fix * Update packages/frontend/src/components/MkPostForm.vue Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * reformat --------- Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2023-07-28 18:19:33 +00:00 · 2023-07-28 17:46:43 +09:00 · 2023-07-28 14:09:04 +09:00 · 2023-07-28 14:02:58 +09:00
5 changed files with 44 additions and 11 deletions
--- a/CHANGELOG.md
+++ b/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
--- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts
+++ b/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';
--- a/packages/backend/test/e2e/oauth.ts
+++ b/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.
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@ -777,18 +777,25 @@ async function post(ev?: MouseEvent) {
 				claimAchievement('notes1');
 			}

-			const text = postData.text?.toLowerCase() ?? '';
-			if ((text.includes('love') || text.includes('❤')) && text.includes('misskey')) {
+			const text = postData.text ?? '';
+			const lowerCase = text.toLowerCase();
+			if ((lowerCase.includes('love') || lowerCase.includes('❤')) && lowerCase.includes('misskey')) {
 				claimAchievement('iLoveMisskey');
 			}
-			if (
-				text.includes('https://youtu.be/Efrlqw8ytg4'.toLowerCase()) ||
-				text.includes('https://www.youtube.com/watch?v=Efrlqw8ytg4'.toLowerCase()) ||
-				text.includes('https://m.youtube.com/watch?v=Efrlqw8ytg4'.toLowerCase()) ||
-				text.includes('https://youtu.be/XVCwzwxdHuA'.toLowerCase()) ||
-				text.includes('https://www.youtube.com/watch?v=XVCwzwxdHuA'.toLowerCase()) ||
-				text.includes('https://m.youtube.com/watch?v=XVCwzwxdHuA'.toLowerCase())
-			) {
+			if ([
+				'https://youtu.be/Efrlqw8ytg4',
+				'https://www.youtube.com/watch?v=Efrlqw8ytg4',
+				'https://m.youtube.com/watch?v=Efrlqw8ytg4',
+			
+				'https://youtu.be/XVCwzwxdHuA',
+				'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');
 			}

--- a/packages/frontend/src/pages/oauth.vue
+++ b/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>
Author	SHA1	Message	Date
Sam Smucny	9beca6fcf8	Merge branch 'develop' into ssmucny-events	2023-07-28 18:19:33 +00:00
Kagami Sascha Rosylight	339086995f	chore(frontend): support Spotify for brainDiver (#11407 ) * chore(frontend): support Spotify for brainDiver * no lowercase * album * syntax fix * Update packages/frontend/src/components/MkPostForm.vue Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * reformat --------- Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>	2023-07-28 17:46:43 +09:00
syuilo	bbd618a258	Update CHANGELOG.md	2023-07-28 14:09:04 +09:00
syuilo	ab3cd7b837	chore: add missing license identifier	2023-07-28 14:02:58 +09:00