Merge pull request #137 from YuStudy-Inc/finalfixes

bruh i forogt this

Author: Nickthecan

Backend/controllers/userController.js

@@ -70,8 +70,7 @@ export const createUser = async(req, res) => {
             username,
             email,
             password: hashedPassword,
-            isOneline: true,
-            pfp: "", //pfp string url, save a temp one for now after creation
+            isOneline: true, //got rid of pfp so it uses the default values
             description: "", //description, empty for now (could default to "" in the schema)
             friendsList: [],
             friendRequest: [],
@@ -484,7 +483,7 @@ export const acceptFriendRequest = async(req, res) => {
 export const rejectFriendRequest = async(req, res) => {
     try {
         const userId = req.params.id
-        const user = await User.findByid(userId)
+        const user = await User.findById(userId)
 
         const otherUser = req.body.friendId;
         const rejectingUser = await User.findById(otherUser);
@@ -498,6 +497,10 @@ export const rejectFriendRequest = async(req, res) => {
             return;
         }
 
+        if (!user.friendRequests.includes(otherUser)) {
+            return res.status(400).json({ message: "No such friend request exists" });
+        }
+
         user.friendRequests.pull(rejectingUser._id);
         await user.save()
         res.status(200).json({message: 'Friend request rejected!'})