Merge branch 'develop' of Software_Engineering_I/greenvironment-server into master

src/app.ts

@@ -164,7 +164,7 @@ class App {
         this.app.use("/home", homeRoute.router);
         this.limiter({
             expire: config.get("api.rateLimit.upload.expire"),
-            lookup: ["connection.remoteAddress"],
+            lookup: ["connection.remoteAddress", "session.userId"],
             method: "all",
             onRateLimited: (req: IncomingMessage, res: any) => {
                 res.status(httpStatus.TOO_MANY_REQUESTS);
@@ -179,7 +179,7 @@ class App {
         // listen for graphql requests
         this.limiter({
             expire: config.get("api.rateLimit.graphql.expire"),
-            lookup: ["connection.remoteAddress"],
+            lookup: ["connection.remoteAddress", "session.userId"],
             method: "all",
             onRateLimited: (req: IncomingMessage, res: any) => {
                 res.status(httpStatus.TOO_MANY_REQUESTS);

src/lib/models/User.ts

@@ -293,7 +293,13 @@ export class User extends Model<User> {
         offset = offset ?? 0;
         let friendList = await this.$get("rFriendOf", {limit, offset}) as User[];
         friendList = friendList.concat(await this.$get("rFriends", {limit, offset}) as User[]);
-        return friendList.slice(0, limit);
+        const resultList: User[] = [];
+        for (const friend of friendList) {
+            if (!resultList.find((user) => user.id === friend.id) && friend.id !== this.id) {
+                resultList.push(friend);
+            }
+        }
+        return resultList.slice(0, limit);
     }
 
     /**
@@ -430,7 +436,7 @@ export class User extends Model<User> {
                 await Friendship.bulkCreate([
                     {userId: this.id, friendId: sender},
                     {userId: sender, friendId: this.id},
-                ], {ignoreDuplicates: true});
+                ], {ignoreDuplicates: false});
                 await request.destroy();
             }
         } else {