Approving avatars adds to library

src/databaseAdapters/user.ts

@@ -1,9 +1,11 @@
 import User from '../models/user';
 import { IUser } from '../gameplay/types';
+import { S3AvatarSet } from '../clients/s3/S3Agent';
+import { getAvatarLibrarySizeForUser } from '../rewards/getRewards';
 
 interface DatabaseAdapter {
   getUser(username: string): Promise<IUser>;
-  updateAvatar(
+  setTemporaryAvatar(
     username: string,
     resLink: string,
     spyLink: string,
@@ -17,13 +19,31 @@ class MongoUserAdapter implements DatabaseAdapter {
     })) as IUser;
   }
 
-  async updateAvatar(username: string, resLink: string, spyLink: string) {
+  async setTemporaryAvatar(username: string, resLink: string, spyLink: string) {
     const user = await this.getUser(username);
 
     user.avatarImgRes = resLink;
     user.avatarImgSpy = spyLink;
     await user.save();
   }
+
+  async setAvatarAndUpdateLibrary(username: string, avatarSet: S3AvatarSet) {
+    const user = await this.getUser(username);
+
+    user.avatarImgRes = avatarSet.resLink;
+    user.avatarImgSpy = avatarSet.spyLink;
+    user.avatarLibrary.push(avatarSet.avatarSetId);
+
+    const librarySize = await getAvatarLibrarySizeForUser(
+      username.toLowerCase(),
+    );
+
+    while (user.avatarLibrary.length > librarySize) {
+      user.avatarLibrary.shift();
+    }
+
+    await user.save();
+  }
 }
 
 const userAdapter = new MongoUserAdapter();

src/models/avatarRequest.js

@@ -5,6 +5,7 @@ const avatarRequestSchema = new mongoose.Schema({
 
   resLink: String,
   spyLink: String,
+  avatarSetId: Number,
   msgToMod: String,
 
   dateRequested: Date,

src/routes/profile/index.tsx

@@ -22,6 +22,7 @@ import {
   getAndUpdatePatreonRewardTierForUser,
   getAvatarLibrarySizeForUser,
 } from '../../rewards/getRewards';
+import userAdapter from '../../databaseAdapters/user';
 
 const MAX_ACTIVE_AVATAR_REQUESTS = 2;
 const MIN_GAMES_REQUIRED = 100;
@@ -171,9 +172,9 @@ router.post(
     }
 
     const avatarReq = await avatarRequest.findById(req.body.avatarreqid);
-    const userRequestingAvatar = await User.findOne({
-      usernameLower: avatarReq.forUsername.toLowerCase(),
-    });
+    const userRequestingAvatar = await userAdapter.getUser(
+      avatarReq.forUsername.toLowerCase(),
+    );
 
     const modWhoProcessed = req.user;
     const decision = req.body.decision;
@@ -183,6 +184,7 @@ router.post(
 
     if (decision) {
       const approvedAvatarLinks = await s3Agent.approveAvatarRequest({
+        avatarSetId: avatarReq.avatarSetId,
         resLink: avatarReq.resLink,
         spyLink: avatarReq.spyLink,
       });
@@ -196,10 +198,10 @@ router.post(
 
       await avatarReq.save();
 
-      userRequestingAvatar.avatarImgRes = avatarReq.resLink;
-      userRequestingAvatar.avatarImgSpy = avatarReq.spyLink;
-
-      await userRequestingAvatar.save();
+      await userAdapter.setAvatarAndUpdateLibrary(
+        userRequestingAvatar.username,
+        approvedAvatarLinks,
+      );
 
       let str = `Your avatar request was approved by ${modWhoProcessed.username}! Their comment was: "${modComment}"`;
       createNotification(
@@ -345,6 +347,7 @@ router.post(
       forUsername: req.params.profileUsername.toLowerCase(),
       resLink: avatarLinks.resLink,
       spyLink: avatarLinks.spyLink,
+      avatarSetId: avatarLinks.avatarSetId,
       msgToMod: msgToMod,
       dateRequested: new Date(),
       processed: false,

src/sockets/commands/mod/mpushavatartolibrary.ts

@@ -51,7 +51,7 @@ export const mpushavatartolibrary: Command = {
     const librarySize = await getAvatarLibrarySizeForUser(usernameLower);
 
     user.avatarLibrary.push(toBeAddedAvatarId);
-    if (user.avatarLibrary.length > librarySize) {
+    while (user.avatarLibrary.length > librarySize) {
       user.avatarLibrary.shift();
     }
 

src/sockets/commands/mod/msetavatar.ts

@@ -38,7 +38,7 @@ export const msetavatar: Command = {
       );
     }
 
-    await userAdapter.updateAvatar(username, resLink, spyLink);
+    await userAdapter.setTemporaryAvatar(username, resLink, spyLink);
     sendReplyToCommand(
       senderSocket,
       `Successfully changed avatars for user: ${username}.`,