Revert "feat: custom achievement"

This reverts commit d6df7e3.
yojo-art · Mar 28, 2024 · c97b64f · c97b64f
1 parent 185fa7a
commit c97b64f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 45 deletions.
diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -6962,16 +6962,6 @@ export interface Locale extends ILocale {
                  */
                 "description": string;
             };
-			"_setNameToYojo": {
-			    /**
-			     * ロリータコンプレックス
-			     */
-				"title": string;
-				/**
-				 これであなたもロリコン
-				 */
-				"description": string;
-			}
             "_passedSinceAccountCreated1": {
                 /**
                  * 一周年

diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
@@ -84,7 +84,6 @@ export const ACHIEVEMENT_TYPES = [
 	'justPlainLucky',
 	'setNameToSyuilo',
 	'setNameToNoriDev',
-	'setNameToYojo',
 	'cookieClicked',
 	'brainDiver',
 	'smashTestNotificationButton',

diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
@@ -17246,7 +17246,7 @@ export type operations = {
       content: {
         'application/json': {
           /** @enum {string} */
-          name: 'notes1' | 'notes10' | 'notes100' | 'notes500' | 'notes1000' | 'notes5000' | 'notes10000' | 'notes20000' | 'notes30000' | 'notes40000' | 'notes50000' | 'notes60000' | 'notes70000' | 'notes80000' | 'notes90000' | 'notes100000' | 'login3' | 'login7' | 'login15' | 'login30' | 'login60' | 'login100' | 'login200' | 'login300' | 'login400' | 'login500' | 'login600' | 'login700' | 'login800' | 'login900' | 'login1000' | 'passedSinceAccountCreated1' | 'passedSinceAccountCreated2' | 'passedSinceAccountCreated3' | 'loggedInOnBirthday' | 'loggedInOnNewYearsDay' | 'noteClipped1' | 'noteFavorited1' | 'myNoteFavorited1' | 'profileFilled' | 'markedAsCat' | 'following1' | 'following10' | 'following50' | 'following100' | 'following300' | 'followers1' | 'followers10' | 'followers50' | 'followers100' | 'followers300' | 'followers500' | 'followers1000' | 'collectAchievements30' | 'viewAchievements3min' | 'iLoveCherryPick' | 'foundTreasure' | 'client30min' | 'client60min' | 'noteDeletedWithin1min' | 'postedAtLateNight' | 'postedAt0min0sec' | 'selfQuote' | 'htl20npm' | 'viewInstanceChart' | 'outputHelloWorldOnScratchpad' | 'open3windows' | 'driveFolderCircularReference' | 'reactWithoutRead' | 'clickedClickHere' | 'justPlainLucky' | 'setNameToSyuilo' | 'setNameToNoriDev' | 'setNameToYojo' |'cookieClicked' | 'brainDiver' | 'smashTestNotificationButton' | 'tutorialCompleted' | 'bubbleGameExplodingHead' | 'bubbleGameDoubleExplodingHead';
+          name: 'notes1' | 'notes10' | 'notes100' | 'notes500' | 'notes1000' | 'notes5000' | 'notes10000' | 'notes20000' | 'notes30000' | 'notes40000' | 'notes50000' | 'notes60000' | 'notes70000' | 'notes80000' | 'notes90000' | 'notes100000' | 'login3' | 'login7' | 'login15' | 'login30' | 'login60' | 'login100' | 'login200' | 'login300' | 'login400' | 'login500' | 'login600' | 'login700' | 'login800' | 'login900' | 'login1000' | 'passedSinceAccountCreated1' | 'passedSinceAccountCreated2' | 'passedSinceAccountCreated3' | 'loggedInOnBirthday' | 'loggedInOnNewYearsDay' | 'noteClipped1' | 'noteFavorited1' | 'myNoteFavorited1' | 'profileFilled' | 'markedAsCat' | 'following1' | 'following10' | 'following50' | 'following100' | 'following300' | 'followers1' | 'followers10' | 'followers50' | 'followers100' | 'followers300' | 'followers500' | 'followers1000' | 'collectAchievements30' | 'viewAchievements3min' | 'iLoveCherryPick' | 'foundTreasure' | 'client30min' | 'client60min' | 'noteDeletedWithin1min' | 'postedAtLateNight' | 'postedAt0min0sec' | 'selfQuote' | 'htl20npm' | 'viewInstanceChart' | 'outputHelloWorldOnScratchpad' | 'open3windows' | 'driveFolderCircularReference' | 'reactWithoutRead' | 'clickedClickHere' | 'justPlainLucky' | 'setNameToSyuilo' | 'setNameToNoriDev' | 'cookieClicked' | 'brainDiver' | 'smashTestNotificationButton' | 'tutorialCompleted' | 'bubbleGameExplodingHead' | 'bubbleGameDoubleExplodingHead';
         };
       };
     };

diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
@@ -202,9 +202,6 @@ function save() {
 	if (profile.name === 'noridev' || profile.name === 'NoriDev' || profile.name === '노리' || profile.name === '노리데브') {
 		claimAchievement('setNameToNoriDev');
 	}
-	if (profile.name === '幼女' || profile.name === 'ようじょ' || profile.name === 'yojo' || profile.name === 'Yojo' || profile.name === 'ょぅι゛ょ') {
-		claimAchievement('setNameToYojo');
-	}
 	if (profile.isCat && defaultStore.state.renameTheButtonInPostFormToNya) {
 		claimAchievement('markedAsCat');
 	} else if (profile.isCat && !defaultStore.state.renameTheButtonInPostFormToNya) {

diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
@@ -80,17 +80,12 @@ export const ACHIEVEMENT_TYPES = [
 	'justPlainLucky',
 	'setNameToSyuilo',
 	'setNameToNoriDev',
-	'setNameToYojo',
 	'cookieClicked',
 	'brainDiver',
 	'smashTestNotificationButton',
 	'tutorialCompleted',
 	'bubbleGameExplodingHead',
 	'bubbleGameDoubleExplodingHead',
-	'ohayoujo1',
-	'ohayoujo7',
-	'ohayoujo30',
-	'ohayoujo365',
 ] as const;
 
 export const ACHIEVEMENT_BADGES = {
@@ -434,11 +429,6 @@ export const ACHIEVEMENT_BADGES = {
 		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
 		frame: 'bronze',
 	},
-	'setNameToYojo': {
-		img: '/fluent-emoji/1f36e.png',
-		bg: 'linear-gradient(0deg, rgb(187 183 59), rgb(255 143 77))',
-		frame: 'platinum',
-	},
 	'passedSinceAccountCreated1': {
 		img: '/fluent-emoji/0031-20e3.png',
 		bg: null,
@@ -494,26 +484,6 @@ export const ACHIEVEMENT_BADGES = {
 		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
 		frame: 'silver',
 	},
-	'ohayoujo1': {
-		img: '/fluent-emoji/1f331.png',
-		bg: null,
-		frame: 'bronze',
-	},
-	'ohayoujo7': {
-		img: '/fluent-emoji/1f337.png',
-		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
-		frame: 'bronze',
-	},
-	'ohayoujo30': {
-		img: '/fluent-emoji/1f32f.png',
-		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
-		frame: 'silver',
-	},
-	'ohayoujo365': {
-		img: '/fluent-emoji/1f336.png',
-		bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))',
-		frame: 'gold',
-	},
 /* @see <https://github.com/misskey-dev/misskey/pull/10365#discussion_r1155511107>
 } as const satisfies Record<typeof ACHIEVEMENT_TYPES[number], {
 	img: string;