some more achievements (#1319)

k2xl · web-flow · commit 51cae64e4dd5 · 2025-07-25T15:55:12.000-04:00
* some more achievements

* update on update
diff --git a/constants/achievements/AchievementRulesSocial.ts b/constants/achievements/AchievementRulesSocial.ts
@@ -2,7 +2,7 @@ import { IAchievementInfo } from './achievementInfo';
 import AchievementType from './achievementType';
 
 interface IAchievementInfoSocial extends IAchievementInfo {
-  unlocked: ({ commentCount, hasWelcomed, hasSharedToSocial }: { commentCount: number, hasWelcomed: boolean, hasSharedToSocial: boolean }) => boolean;
+  unlocked: ({ commentCount, hasWelcomed, hasSharedToSocial, user }: { commentCount: number, hasWelcomed: boolean, hasSharedToSocial: boolean, user: User }) => boolean;
 }
 
 const AchievementRulesSocial: { [achievementType: string]: IAchievementInfoSocial } = {};
@@ -57,6 +57,26 @@ AchievementRulesSocial[AchievementType.WELCOME] = {
     return hasWelcomed;
   },
 };
+AchievementRulesSocial[AchievementType.UPLOAD_AVATAR] = {
+  getDescription: () => 'Uploaded an avatar to personalize your profile',
+  name: 'Avatar Awakened',
+  emoji: '🖼️',
+  discordNotification: false,
+  secret: true,
+  unlocked: ({ user }) => {
+    return !!(user?.avatarUpdatedAt);
+  },
+};
+AchievementRulesSocial[AchievementType.UPDATE_BIO] = {
+  getDescription: () => 'Added a bio to your profile',
+  name: 'Autobiographer',
+  emoji: '✍️',
+  discordNotification: false,
+  secret: true,
+  unlocked: ({ user }) => {
+    return !!(user?.bio && user.bio.length > 0);
+  },
+};
 AchievementRulesSocial[AchievementType.SOCIAL_SHARE] = {
   getDescription: () => 'Shared a level to a social network',
   name: 'Social Sharer',
diff --git a/constants/achievements/achievementType.ts b/constants/achievements/achievementType.ts
@@ -48,6 +48,8 @@ enum AchievementType {
   CHAPTER_1_COMPLETED = 'CHAPTER_1_COMPLETED',
   CHAPTER_2_COMPLETED = 'CHAPTER_2_COMPLETED',
   CHAPTER_3_COMPLETED = 'CHAPTER_3_COMPLETED',
+  UPLOAD_AVATAR = 'UPLOAD_AVATAR',
+  UPDATE_BIO = 'UPDATE_BIO',
   SOCIAL_SHARE = 'SOCIAL_SHARE',
 }
 
diff --git a/helpers/refreshAchievements.ts b/helpers/refreshAchievements.ts
@@ -21,8 +21,8 @@ import { getRecordsByUserId } from './getRecordsByUserId';
 
 const AchievementCategoryFetch = {
   // no game ID as this is a global
-  [AchievementCategory.SOCIAL]: async (gameId: GameId, userId: Types.ObjectId) => {
-    const [commentCount, welcomeComments, socialShareCount] = await Promise.all([
+  [AchievementCategory.SOCIAL]: async (_gameId: GameId, userId: Types.ObjectId) => {
+    const [commentCount, welcomeComments, socialShareCount, user] = await Promise.all([
       CommentModel.countDocuments({
         author: userId,
         deletedAt: null,
@@ -34,23 +34,22 @@ const AchievementCategoryFetch = {
         target: { $ne: userId },
         text: { $regex: /welcome/i },
       }).populate('target').lean<Comment[]>(),
-      GraphModel.countDocuments({ source: userId, type: GraphType.SHARE })
+      GraphModel.countDocuments({ source: userId, type: GraphType.SHARE }),
+      UserModel.findById(userId).select('+bio +avatarUpdatedAt').lean<User>()
     ]);
 
     const hasWelcomed = welcomeComments.some((comment) => {
-      const user = comment.target as unknown as User;
+      const targetUser = comment.target as unknown as User;
 
-      if (!user?.ts) {
+      if (!targetUser?.ts) {
         return false;
       }
 
       // if the comment was made in the first 24 hrs since account creation
-      return comment.createdAt.getTime() - 1000 * user.ts < 24 * 60 * 60 * 1000;
+      return comment.createdAt.getTime() - 1000 * targetUser.ts < 24 * 60 * 60 * 1000;
     });
 
-    const hasSharedToSocial = socialShareCount > 0;
-
-    return { commentCount: commentCount, hasWelcomed: hasWelcomed, hasSharedToSocial: hasSharedToSocial };
+    return { commentCount: commentCount, hasWelcomed: hasWelcomed, hasSharedToSocial: socialShareCount > 0, user: user };
   },
   [AchievementCategory.PROGRESS]: async (gameId: GameId, userId: Types.ObjectId) => {
     const userConfig = await UserConfigModel.findOne({ userId: userId, gameId: gameId }).lean<User>();
diff --git a/pages/api/user/image.ts b/pages/api/user/image.ts
@@ -1,12 +1,15 @@
 import { Types } from 'mongoose';
 import { NextApiResponse } from 'next';
 import sharp from 'sharp';
+import AchievementCategory from '../../../constants/achievements/achievementCategory';
 import Dimensions from '../../../constants/dimensions';
+import { GameId } from '../../../constants/GameId';
 import { TimerUtil } from '../../../helpers/getTs';
 import { logger } from '../../../helpers/logger';
 import dbConnect from '../../../lib/dbConnect';
 import withAuth, { NextApiRequestWithAuth } from '../../../lib/withAuth';
 import { ImageModel, UserModel } from '../../../models/mongoose';
+import { queueRefreshAchievements } from '../internal-jobs/worker/queueFunctions';
 
 export const config = {
   api: {
@@ -96,6 +99,7 @@ export default withAuth({ PUT: {} }, async (req: NextApiRequestWithAuth, res: Ne
           ts: ts,
         } }),
       UserModel.updateOne({ _id: req.userId }, { $set: { avatarUpdatedAt: ts } }),
+      queueRefreshAchievements(GameId.THINKY, req.userId, [AchievementCategory.SOCIAL]),
     ]);
 
     return res.status(200).send({ updated: true });
diff --git a/pages/api/user/index.ts b/pages/api/user/index.ts
@@ -9,6 +9,8 @@ import User from '@root/models/db/user';
 import bcrypt from 'bcryptjs';
 import mongoose from 'mongoose';
 import type { NextApiResponse } from 'next';
+import AchievementCategory from '../../../constants/achievements/achievementCategory';
+import { GameId } from '../../../constants/GameId';
 import PrivateTagType from '../../../constants/privateTagType';
 import { ValidType } from '../../../helpers/apiWrapper';
 import { generateCollectionSlug, generateLevelSlug } from '../../../helpers/generateSlug';
@@ -19,6 +21,7 @@ import dbConnect from '../../../lib/dbConnect';
 import withAuth, { NextApiRequestWithAuth } from '../../../lib/withAuth';
 import Level from '../../../models/db/level';
 import { CollectionModel, LevelModel, MultiplayerProfileModel, UserModel } from '../../../models/mongoose';
+import { queueRefreshAchievements } from '../internal-jobs/worker/queueFunctions';
 import { getSubscriptions, SubscriptionData } from '../subscription';
 import { getUserConfig } from '../user-config';
 
@@ -177,6 +180,11 @@ export default withAuth({
           return res.status(error.status).json({ error: error.message });
         }
       }
+
+      // Queue achievement refresh if bio was updated
+      if (bio !== undefined) {
+        await queueRefreshAchievements(GameId.THINKY, req.user._id, [AchievementCategory.SOCIAL]);
+      }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       logger.error(err);
diff --git a/tests/helpers/refreshAchievements.test.ts b/tests/helpers/refreshAchievements.test.ts
@@ -5,7 +5,7 @@ import GraphType from '@root/constants/graphType';
 import TestId from '@root/constants/testId';
 import { refreshAchievements } from '@root/helpers/refreshAchievements';
 import { getTokenCookieValue } from '@root/lib/getTokenCookie';
-import { AchievementModel, GraphModel, LevelModel, UserConfigModel } from '@root/models/mongoose';
+import { AchievementModel, GraphModel, LevelModel, UserConfigModel, UserModel } from '@root/models/mongoose';
 import { processQueueMessages } from '@root/pages/api/internal-jobs/worker';
 import socialShareHandler from '@root/pages/api/social-share/index';
 import { Types } from 'mongoose';
@@ -83,6 +83,71 @@ describe('helpers/refreshAchievements.ts', () => {
     expect(achievements.some(a => a.type === AchievementType.CHAPTER_3_COMPLETED)).toBe(true);
   });
 
+  test('test avatar upload achievement', async () => {
+    // Clean up any existing achievements
+    await AchievementModel.deleteMany({ userId: TestId.USER });
+
+    // Test without avatar
+    await UserModel.updateOne(
+      { _id: TestId.USER },
+      { $unset: { avatarUpdatedAt: 1 } }
+    );
+
+    await refreshAchievements(GameId.THINKY, new Types.ObjectId(TestId.USER), [AchievementCategory.SOCIAL]);
+    let achievements = await AchievementModel.find({ userId: TestId.USER }).lean();
+
+    expect(achievements.some(a => a.type === AchievementType.UPLOAD_AVATAR)).toBe(false);
+
+    // Test with avatar
+    await UserModel.updateOne(
+      { _id: TestId.USER },
+      { $set: { avatarUpdatedAt: Date.now() } }
+    );
+
+    await refreshAchievements(GameId.THINKY, new Types.ObjectId(TestId.USER), [AchievementCategory.SOCIAL]);
+    achievements = await AchievementModel.find({ userId: TestId.USER }).lean();
+
+    expect(achievements.some(a => a.type === AchievementType.UPLOAD_AVATAR)).toBe(true);
+  });
+
+  test('test bio update achievement', async () => {
+    // Clean up any existing achievements
+    await AchievementModel.deleteMany({ userId: TestId.USER });
+
+    // Test without bio
+    await UserModel.updateOne(
+      { _id: TestId.USER },
+      { $unset: { bio: 1 } }
+    );
+
+    await refreshAchievements(GameId.THINKY, new Types.ObjectId(TestId.USER), [AchievementCategory.SOCIAL]);
+    let achievements = await AchievementModel.find({ userId: TestId.USER }).lean();
+
+    expect(achievements.some(a => a.type === AchievementType.UPDATE_BIO)).toBe(false);
+
+    // Test with empty bio
+    await UserModel.updateOne(
+      { _id: TestId.USER },
+      { $set: { bio: '' } }
+    );
+
+    await refreshAchievements(GameId.THINKY, new Types.ObjectId(TestId.USER), [AchievementCategory.SOCIAL]);
+    achievements = await AchievementModel.find({ userId: TestId.USER }).lean();
+
+    expect(achievements.some(a => a.type === AchievementType.UPDATE_BIO)).toBe(false);
+
+    // Test with non-empty bio
+    await UserModel.updateOne(
+      { _id: TestId.USER },
+      { $set: { bio: 'This is my bio!' } }
+    );
+
+    await refreshAchievements(GameId.THINKY, new Types.ObjectId(TestId.USER), [AchievementCategory.SOCIAL]);
+    achievements = await AchievementModel.find({ userId: TestId.USER }).lean();
+
+    expect(achievements.some(a => a.type === AchievementType.UPDATE_BIO)).toBe(true);
+  });
+
   describe('SOCIAL achievements', () => {
     beforeEach(async () => {
       await AchievementModel.deleteMany({ userId: TestId.USER });

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ enum AchievementType {`
`48`	`48`	`CHAPTER_1_COMPLETED = 'CHAPTER_1_COMPLETED',`
`49`	`49`	`CHAPTER_2_COMPLETED = 'CHAPTER_2_COMPLETED',`
`50`	`50`	`CHAPTER_3_COMPLETED = 'CHAPTER_3_COMPLETED',`
	`51`	`+ UPLOAD_AVATAR = 'UPLOAD_AVATAR',`
	`52`	`+ UPDATE_BIO = 'UPDATE_BIO',`
`51`	`53`	`SOCIAL_SHARE = 'SOCIAL_SHARE',`
`52`	`54`	`}`
`53`	`55`